diff options
393 files changed, 6047 insertions, 1981 deletions
diff --git a/api/current.xml b/api/current.xml index eaa750e..1b3c731 100644 --- a/api/current.xml +++ b/api/current.xml @@ -72665,6 +72665,17 @@ <parameter name="message" type="java.lang.String"> </parameter> </constructor> +<field name="TYPE_ACQUIRE_DRM_INFO_FAILED" + type="int" + transient="false" + volatile="false" + value="2008" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="TYPE_NOT_SUPPORTED" type="int" transient="false" @@ -73018,6 +73029,17 @@ visibility="public" > </field> +<field name="TYPE_RIGHTS_REMOVED" + type="int" + transient="false" + volatile="false" + value="6" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="TYPE_WAIT_FOR_RIGHTS" type="int" transient="false" @@ -94459,6 +94481,17 @@ visibility="public" > </method> +<method name="getSerial" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getUri" return="java.lang.String" abstract="false" @@ -154761,6 +154794,21 @@ <parameter name="target" type="java.util.List<android.preference.PreferenceActivity.Header>"> </parameter> </method> +<method name="onBuildStartFragmentIntent" + return="android.content.Intent" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="fragmentName" type="java.lang.String"> +</parameter> +<parameter name="args" type="android.os.Bundle"> +</parameter> +</method> <method name="onGetInitialHeader" return="android.preference.PreferenceActivity.Header" abstract="false" diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index ccd65de..c9351af 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -416,7 +416,7 @@ public class Notification implements Parcelable if (this.largeIcon != null) { that.largeIcon = Bitmap.createBitmap(this.largeIcon); } - that.iconLevel = that.iconLevel; + that.iconLevel = this.iconLevel; that.sound = this.sound; // android.net.Uri is immutable that.audioStreamType = this.audioStreamType; diff --git a/core/java/android/hardware/usb/UsbAccessory.java b/core/java/android/hardware/usb/UsbAccessory.java index cc174d4..5e9ead0 100644 --- a/core/java/android/hardware/usb/UsbAccessory.java +++ b/core/java/android/hardware/usb/UsbAccessory.java @@ -33,18 +33,20 @@ public class UsbAccessory implements Parcelable { private final String mDescription; private final String mVersion; private final String mUri; + private final String mSerial; /** * UsbAccessory should only be instantiated by UsbService implementation * @hide */ public UsbAccessory(String manufacturer, String model, String description, - String version, String uri) { + String version, String uri, String serial) { mManufacturer = manufacturer; mModel = model; mDescription = description; mVersion = version; mUri = uri; + mSerial = serial; } /** @@ -57,6 +59,7 @@ public class UsbAccessory implements Parcelable { mDescription = strings[2]; mVersion = strings[3]; mUri = strings[4]; + mSerial = strings[5]; } /** @@ -106,6 +109,17 @@ public class UsbAccessory implements Parcelable { return mUri; } + /** + * Returns the unique serial number for the accessory. + * This is an optional serial number that can be used to differentiate + * between individual accessories of the same model and manufacturer + * + * @return the unique serial number + */ + public String getSerial() { + return mSerial; + } + private static boolean compare(String s1, String s2) { if (s1 == null) return (s2 == null); return s1.equals(s2); @@ -119,7 +133,8 @@ public class UsbAccessory implements Parcelable { compare(mModel, accessory.getModel()) && compare(mDescription, accessory.getDescription()) && compare(mVersion, accessory.getVersion()) && - compare(mUri, accessory.getUri())); + compare(mUri, accessory.getUri()) && + compare(mSerial, accessory.getSerial())); } return false; } @@ -130,7 +145,8 @@ public class UsbAccessory implements Parcelable { (mModel == null ? 0 : mModel.hashCode()) ^ (mDescription == null ? 0 : mDescription.hashCode()) ^ (mVersion == null ? 0 : mVersion.hashCode()) ^ - (mUri == null ? 0 : mUri.hashCode())); + (mUri == null ? 0 : mUri.hashCode()) ^ + (mSerial == null ? 0 : mSerial.hashCode())); } @Override @@ -139,7 +155,8 @@ public class UsbAccessory implements Parcelable { ", mModel=" + mModel + ", mDescription=" + mDescription + ", mVersion=" + mVersion + - ", mUri=" + mUri + "]"; + ", mUri=" + mUri + + ", mSerial=" + mSerial + "]"; } public static final Parcelable.Creator<UsbAccessory> CREATOR = @@ -150,7 +167,8 @@ public class UsbAccessory implements Parcelable { String description = in.readString(); String version = in.readString(); String uri = in.readString(); - return new UsbAccessory(manufacturer, model, description, version, uri); + String serial = in.readString(); + return new UsbAccessory(manufacturer, model, description, version, uri, serial); } public UsbAccessory[] newArray(int size) { @@ -168,5 +186,6 @@ public class UsbAccessory implements Parcelable { parcel.writeString(mDescription); parcel.writeString(mVersion); parcel.writeString(mUri); + parcel.writeString(mSerial); } } diff --git a/core/java/android/os/Looper.java b/core/java/android/os/Looper.java index 8204e3c..ccf642c 100644 --- a/core/java/android/os/Looper.java +++ b/core/java/android/os/Looper.java @@ -141,7 +141,8 @@ public class Looper { Log.wtf("Looper", "Thread identity changed from 0x" + Long.toHexString(ident) + " to 0x" + Long.toHexString(newIdent) + " while dispatching to " - + msg.target + " " + msg.callback + " what=" + msg.what); + + msg.target.getClass().getName() + " " + + msg.callback + " what=" + msg.what); } msg.recycle(); diff --git a/core/java/android/preference/CheckBoxPreference.java b/core/java/android/preference/CheckBoxPreference.java index f16a7e4..2bf6c7b 100644 --- a/core/java/android/preference/CheckBoxPreference.java +++ b/core/java/android/preference/CheckBoxPreference.java @@ -24,8 +24,10 @@ import android.os.Parcel; import android.os.Parcelable; import android.util.AttributeSet; import android.view.View; +import android.view.ViewGroup; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; +import android.widget.CheckBox; import android.widget.Checkable; import android.widget.TextView; @@ -90,8 +92,16 @@ public class CheckBoxPreference extends Preference { checkboxView.isEnabled()) { mSendAccessibilityEventViewClickedType = false; - int eventType = AccessibilityEvent.TYPE_VIEW_CLICKED; - checkboxView.sendAccessibilityEventUnchecked(AccessibilityEvent.obtain(eventType)); + // we send an event on behalf of the check box because in onBind the latter + // is detached from its parent and such views do not send accessibility events + AccessibilityEvent event = AccessibilityEvent.obtain( + AccessibilityEvent.TYPE_VIEW_CLICKED); + event.setClassName(checkboxView.getClass().getName()); + event.setPackageName(getContext().getPackageName()); + event.setEnabled(checkboxView.isEnabled()); + event.setContentDescription(checkboxView.getContentDescription()); + event.setChecked(((Checkable) checkboxView).isChecked()); + mAccessibilityManager.sendAccessibilityEvent(event); } } diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java index ad0bc84..db50bfc 100644 --- a/core/java/android/preference/PreferenceActivity.java +++ b/core/java/android/preference/PreferenceActivity.java @@ -961,6 +961,27 @@ public abstract class PreferenceActivity extends ListActivity implements } /** + * Called by {@link #startWithFragment(String, Bundle, Fragment, int)} when + * in single-pane mode, to build an Intent to launch a new activity showing + * the selected fragment. The default implementation constructs an Intent + * that re-launches the current activity with the appropriate arguments to + * display the fragment. + * + * @param fragmentName The name of the fragment to display. + * @param args Optional arguments to supply to the fragment. + * @return Returns an Intent that can be launched to display the given + * fragment. + */ + public Intent onBuildStartFragmentIntent(String fragmentName, Bundle args) { + Intent intent = new Intent(Intent.ACTION_MAIN); + intent.setClass(this, getClass()); + intent.putExtra(EXTRA_SHOW_FRAGMENT, fragmentName); + intent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, args); + intent.putExtra(EXTRA_NO_HEADERS, true); + return intent; + } + + /** * Start a new instance of this activity, showing only the given * preference fragment. When launched in this mode, the header list * will be hidden and the given preference fragment will be instantiated @@ -968,14 +989,14 @@ public abstract class PreferenceActivity extends ListActivity implements * * @param fragmentName The name of the fragment to display. * @param args Optional arguments to supply to the fragment. + * @param resultTo Option fragment that should receive the result of + * the activity launch. + * @param resultRequestCode If resultTo is non-null, this is the request + * code in which to report the result. */ public void startWithFragment(String fragmentName, Bundle args, Fragment resultTo, int resultRequestCode) { - Intent intent = new Intent(Intent.ACTION_MAIN); - intent.setClass(this, getClass()); - intent.putExtra(EXTRA_SHOW_FRAGMENT, fragmentName); - intent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, args); - intent.putExtra(EXTRA_NO_HEADERS, true); + Intent intent = onBuildStartFragmentIntent(fragmentName, args); if (resultTo == null) { startActivity(intent); } else { diff --git a/core/java/android/view/GLES20Canvas.java b/core/java/android/view/GLES20Canvas.java index fa5479b..14f2e9d 100644 --- a/core/java/android/view/GLES20Canvas.java +++ b/core/java/android/view/GLES20Canvas.java @@ -245,12 +245,13 @@ class GLES20Canvas extends HardwareCanvas { private static native void nDestroyDisplayList(int displayList); @Override - public boolean drawDisplayList(DisplayList displayList, Rect dirty) { + public boolean drawDisplayList(DisplayList displayList, int width, int height, Rect dirty) { return nDrawDisplayList(mRenderer, - ((GLES20DisplayList) displayList).mNativeDisplayList, dirty); + ((GLES20DisplayList) displayList).mNativeDisplayList, width, height, dirty); } - private static native boolean nDrawDisplayList(int renderer, int displayList, Rect dirty); + private static native boolean nDrawDisplayList(int renderer, int displayList, + int width, int height, Rect dirty); /////////////////////////////////////////////////////////////////////////// // Hardware layer diff --git a/core/java/android/view/HardwareCanvas.java b/core/java/android/view/HardwareCanvas.java index cb1003a..caa7b74 100644 --- a/core/java/android/view/HardwareCanvas.java +++ b/core/java/android/view/HardwareCanvas.java @@ -53,13 +53,15 @@ public abstract class HardwareCanvas extends Canvas { * Draws the specified display list onto this canvas. * * @param displayList The display list to replay. + * @param width The width of the display list. + * @param height The height of the display list. * @param dirty The dirty region to redraw in the next pass, matters only * if this method returns true, can be null. * * @return True if the content of the display list requires another * drawing pass (invalidate()), false otherwise */ - abstract boolean drawDisplayList(DisplayList displayList, Rect dirty); + abstract boolean drawDisplayList(DisplayList displayList, int width, int height, Rect dirty); /** * Draws the specified layer onto this canvas. diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java index 0cf7ae6..8584bf2 100644 --- a/core/java/android/view/HardwareRenderer.java +++ b/core/java/android/view/HardwareRenderer.java @@ -608,7 +608,8 @@ public abstract class HardwareRenderer { DisplayList displayList = view.getDisplayList(); if (displayList != null) { - if (canvas.drawDisplayList(displayList, mRedrawClip)) { + if (canvas.drawDisplayList(displayList, view.getWidth(), + view.getHeight(), mRedrawClip)) { if (mRedrawClip.isEmpty() || view.getParent() == null) { view.invalidate(); } else { diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 32c9e27..5a96efd 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -59,7 +59,6 @@ import android.util.Pools; import android.util.SparseArray; import android.util.TypedValue; import android.view.ContextMenu.ContextMenuInfo; -import android.view.View.MeasureSpec; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityEventSource; import android.view.accessibility.AccessibilityManager; @@ -4651,6 +4650,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility * @return True if the event was handled by the view, false otherwise. */ public boolean dispatchGenericMotionEvent(MotionEvent event) { + //noinspection SimplifiableIfStatement if (mOnGenericMotionListener != null && (mViewFlags & ENABLED_MASK) == ENABLED && mOnGenericMotionListener.onGenericMotion(this, event)) { return true; @@ -9326,7 +9326,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility } final ScrollabilityCache scrollabilityCache = mScrollCache; - int length = scrollabilityCache.fadingEdgeLength; + final float fadeHeight = scrollabilityCache.fadingEdgeLength; + int length = (int) fadeHeight; // clip the fade length if top and bottom fades overlap // overlapping fades produce odd-looking artifacts @@ -9341,16 +9342,16 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility if (verticalEdges) { topFadeStrength = Math.max(0.0f, Math.min(1.0f, getTopFadingEdgeStrength())); - drawTop = topFadeStrength > 0.0f; + drawTop = topFadeStrength * fadeHeight > 1.0f; bottomFadeStrength = Math.max(0.0f, Math.min(1.0f, getBottomFadingEdgeStrength())); - drawBottom = bottomFadeStrength > 0.0f; + drawBottom = bottomFadeStrength * fadeHeight > 1.0f; } if (horizontalEdges) { leftFadeStrength = Math.max(0.0f, Math.min(1.0f, getLeftFadingEdgeStrength())); - drawLeft = leftFadeStrength > 0.0f; + drawLeft = leftFadeStrength * fadeHeight > 1.0f; rightFadeStrength = Math.max(0.0f, Math.min(1.0f, getRightFadingEdgeStrength())); - drawRight = rightFadeStrength > 0.0f; + drawRight = rightFadeStrength * fadeHeight > 1.0f; } saveCount = canvas.getSaveCount(); @@ -9388,7 +9389,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility final Paint p = scrollabilityCache.paint; final Matrix matrix = scrollabilityCache.matrix; final Shader fade = scrollabilityCache.shader; - final float fadeHeight = scrollabilityCache.fadingEdgeLength; if (drawTop) { matrix.setScale(1, fadeHeight * topFadeStrength); @@ -9438,6 +9438,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility * * @return The known solid color background for this view, or 0 if the color may vary */ + @ViewDebug.ExportedProperty(category = "drawing") public int getSolidColor() { return 0; } @@ -11644,6 +11645,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility * @return true if scrolling was clamped to an over-scroll boundary along either * axis, false otherwise. */ + @SuppressWarnings({"UnusedParameters"}) protected boolean overScrollBy(int deltaX, int deltaY, int scrollX, int scrollY, int scrollRangeX, int scrollRangeY, diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index f9692da..8dc86ac 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -2585,7 +2585,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager } } else { child.mPrivateFlags &= ~DIRTY_MASK; - ((HardwareCanvas) canvas).drawDisplayList(displayList, null); + ((HardwareCanvas) canvas).drawDisplayList(displayList, cr - cl, cb - ct, null); } } } else if (cache != null) { diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index a53c6d0..7d6e18f 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -1175,10 +1175,11 @@ public final class ViewRoot extends Handler implements ViewParent, } } mSurfaceHolder.mSurfaceLock.lock(); - // Make surface invalid. - //mSurfaceHolder.mSurface.copyFrom(mSurface); - mSurfaceHolder.mSurface = new Surface(); - mSurfaceHolder.mSurfaceLock.unlock(); + try { + mSurfaceHolder.mSurface = new Surface(); + } finally { + mSurfaceHolder.mSurfaceLock.unlock(); + } } } diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 2a5c45f..dfdae53 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -5369,7 +5369,8 @@ public class WebView extends AbsoluteLayout private boolean shouldForwardTouchEvent() { return mFullScreenHolder != null || (mForwardTouchEvents && !mSelectingText - && mPreventDefault != PREVENT_DEFAULT_IGNORE); + && mPreventDefault != PREVENT_DEFAULT_IGNORE + && mPreventDefault != PREVENT_DEFAULT_NO); } private boolean inFullScreenMode() { @@ -5949,6 +5950,10 @@ public class WebView extends AbsoluteLayout int y = viewToContentY((int) ev.getY(c) + mScrollY); ted.mPoints[c] = new Point(x, y); } + if (ted.mAction == MotionEvent.ACTION_POINTER_DOWN + || ted.mAction == MotionEvent.ACTION_POINTER_UP) { + ted.mActionIndex = ev.getActionIndex(); + } ted.mMetaState = ev.getMetaState(); ted.mReprocess = true; ted.mMotionEvent = MotionEvent.obtain(ev); diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 979eb2b..bed77ef 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -572,7 +572,7 @@ final class WebViewCore { int framePtr, int nodePtr, int x, int y); private native boolean nativeHandleTouchEvent(int action, int[] idArray, - int[] xArray, int[] yArray, int count, int metaState); + int[] xArray, int[] yArray, int count, int actionIndex, int metaState); private native void nativeUpdateFrameCache(); @@ -829,6 +829,7 @@ final class WebViewCore { int mAction; int[] mIds; // Ids of the touch points Point[] mPoints; + int mActionIndex; // Associated pointer index for ACTION_POINTER_DOWN/UP int mMetaState; boolean mReprocess; MotionEvent mMotionEvent; @@ -1344,7 +1345,7 @@ final class WebViewCore { ted.mNativeLayerRect); } ted.mNativeResult = nativeHandleTouchEvent(ted.mAction, ted.mIds, - xArray, yArray, count, ted.mMetaState); + xArray, yArray, count, ted.mActionIndex, ted.mMetaState); Message.obtain( mWebView.mPrivateHandler, WebView.PREVENT_TOUCH_ID, diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index eca39fc..d39271e 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -5226,6 +5226,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te * * @return The cache color hint */ + @ViewDebug.ExportedProperty(category = "drawing") public int getCacheColorHint() { return mCacheColorHint; } diff --git a/core/java/android/widget/CalendarView.java b/core/java/android/widget/CalendarView.java index 13a407f..f8c76f2 100644 --- a/core/java/android/widget/CalendarView.java +++ b/core/java/android/widget/CalendarView.java @@ -1066,7 +1066,10 @@ public class CalendarView extends FrameLayout { public boolean onTouch(View v, MotionEvent event) { if (mListView.isEnabled() && mGestureDetector.onTouchEvent(event)) { WeekView weekView = (WeekView) v; - weekView.getDayFromLocation(event.getX(), mTempDate); + // if we cannot find a day for the given location we are done + if (!weekView.getDayFromLocation(event.getX(), mTempDate)) { + return true; + } // it is possible that the touched day is outside the valid range // we draw whole weeks but range end can fall not on the week end if (mTempDate.before(mMinDate) || mTempDate.after(mMaxDate)) { @@ -1271,21 +1274,23 @@ public class CalendarView extends FrameLayout { /** * Calculates the day that the given x position is in, accounting for - * week number. Returns a Time referencing that day or null if + * week number. * - * @param x The x position of the touch eventy + * @param x The x position of the touch event. + * @return True if a day was found for the given location. */ - public void getDayFromLocation(float x, Calendar outCalendar) { + public boolean getDayFromLocation(float x, Calendar outCalendar) { int dayStart = mShowWeekNumber ? mWidth / mNumCells : 0; if (x < dayStart || x > mWidth) { outCalendar.clear(); - return; + return false; } // Selection is (x - start) / (pixels/day) == (x -s) * day / pixels int dayPosition = (int) ((x - dayStart) * mDaysPerWeek / (mWidth - dayStart)); outCalendar.setTimeInMillis(mFirstDay.getTimeInMillis()); outCalendar.add(Calendar.DAY_OF_MONTH, dayPosition); + return true; } @Override diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java index 6088654..9933d68 100644 --- a/core/java/android/widget/SearchView.java +++ b/core/java/android/widget/SearchView.java @@ -54,18 +54,16 @@ import android.widget.TextView.OnEditorActionListener; import java.util.WeakHashMap; /** - * Provides the user interface elements for the user to enter a search query and submit a + * A widget that provides a user interface for the user to enter a search query and submit a * request to a search provider. Shows a list of query suggestions or results, if - * available and allows the user to pick a suggestion or result to launch into. + * available, and allows the user to pick a suggestion or result to launch into. * - * <p> - * <b>XML attributes</b> - * <p> - * See {@link android.R.styleable#SearchView SearchView Attributes}, - * {@link android.R.styleable#View View Attributes} + * <p>For more information, see the <a href="{@docRoot}guide/topics/search/index.html">Search</a> + * documentation.<p> * * @attr ref android.R.styleable#SearchView_iconifiedByDefault * @attr ref android.R.styleable#SearchView_maxWidth + * @attr ref android.R.styleable#SearchView_queryHint */ public class SearchView extends LinearLayout { @@ -387,6 +385,8 @@ public class SearchView extends LinearLayout { * in the SearchableInfo. * * @param hint the hint text to display + * + * @attr ref android.R.styleable#SearchView_queryHint */ public void setQueryHint(CharSequence hint) { mQueryHint = hint; @@ -402,6 +402,8 @@ public class SearchView extends LinearLayout { * <p>The default value is true.</p> * * @param iconified whether the search field should be iconified by default + * + * @attr ref android.R.styleable#SearchView_iconifiedByDefault */ public void setIconifiedByDefault(boolean iconified) { if (mIconifiedByDefault == iconified) return; diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 41a7019..a3ea6a9 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -4210,6 +4210,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener @Override protected void onDraw(Canvas canvas) { + if (mPreDrawState == PREDRAW_DONE) { + final ViewTreeObserver observer = getViewTreeObserver(); + observer.removeOnPreDrawListener(this); + mPreDrawState = PREDRAW_NOT_REGISTERED; + } + if (mCurrentAlpha <= ViewConfiguration.ALPHA_THRESHOLD_INT) return; restartMarqueeIfNeeded(); @@ -4281,12 +4287,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } } - if (mPreDrawState == PREDRAW_DONE) { - final ViewTreeObserver observer = getViewTreeObserver(); - observer.removeOnPreDrawListener(this); - mPreDrawState = PREDRAW_NOT_REGISTERED; - } - int color = mCurTextColor; if (mLayout == null) { diff --git a/core/java/com/android/internal/app/IMediaContainerService.aidl b/core/java/com/android/internal/app/IMediaContainerService.aidl index aee1626..dd22e25 100755 --- a/core/java/com/android/internal/app/IMediaContainerService.aidl +++ b/core/java/com/android/internal/app/IMediaContainerService.aidl @@ -27,8 +27,9 @@ interface IMediaContainerService { String key, String resFileName); boolean copyResource(in Uri packageURI, in ParcelFileDescriptor outStream); - PackageInfoLite getMinimalPackageInfo(in Uri fileUri, int flags); - boolean checkFreeStorage(boolean external, in Uri fileUri); + PackageInfoLite getMinimalPackageInfo(in Uri fileUri, in int flags, in long threshold); + boolean checkInternalFreeStorage(in Uri fileUri, in long threshold); + boolean checkExternalFreeStorage(in Uri fileUri); ObbInfo getObbInfo(in String filename); long calculateDirectorySize(in String directory); } diff --git a/core/java/com/android/internal/content/PackageHelper.java b/core/java/com/android/internal/content/PackageHelper.java index d6c43f9..b57046c 100644 --- a/core/java/com/android/internal/content/PackageHelper.java +++ b/core/java/com/android/internal/content/PackageHelper.java @@ -56,18 +56,13 @@ public class PackageHelper { return null; } - public static String createSdDir(long sizeBytes, String cid, + public static String createSdDir(int sizeMb, String cid, String sdEncKey, int uid) { // Create mount point via MountService IMountService mountService = getMountService(); - int sizeMb = (int) (sizeBytes >> 20); - if ((sizeBytes - (sizeMb * 1024 * 1024)) > 0) { - sizeMb++; - } - // Add buffer size - sizeMb++; + if (localLOGV) - Log.i(TAG, "Size of container " + sizeMb + " MB " + sizeBytes + " bytes"); + Log.i(TAG, "Size of container " + sizeMb + " MB"); try { int rc = mountService.createSecureContainer( diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java index 586ba87..81d02ee 100644 --- a/core/java/com/android/internal/widget/ActionBarView.java +++ b/core/java/com/android/internal/widget/ActionBarView.java @@ -462,6 +462,7 @@ public class ActionBarView extends ViewGroup { private void ensureTabsExist() { if (mTabScrollView == null) { mTabScrollView = new HorizontalScrollView(getContext()); + mTabScrollView.setHorizontalFadingEdgeEnabled(true); mTabLayout = new LinearLayout(getContext(), null, com.android.internal.R.attr.actionBarTabBarStyle); mTabScrollView.addView(mTabLayout); diff --git a/core/java/com/google/android/mms/util/PduCache.java b/core/java/com/google/android/mms/util/PduCache.java index 7c3fad7..866ca1e 100644 --- a/core/java/com/google/android/mms/util/PduCache.java +++ b/core/java/com/google/android/mms/util/PduCache.java @@ -235,7 +235,7 @@ public final class PduCache extends AbstractCache<Uri, PduCacheEntry> { } private void removeFromMessageBoxes(Uri key, PduCacheEntry entry) { - HashSet<Uri> msgBox = mThreads.get(entry.getMessageBox()); + HashSet<Uri> msgBox = mThreads.get(Long.valueOf(entry.getMessageBox())); if (msgBox != null) { msgBox.remove(key); } diff --git a/core/jni/android/graphics/Shader.cpp b/core/jni/android/graphics/Shader.cpp index 0ea8225..7fdad10 100644 --- a/core/jni/android/graphics/Shader.cpp +++ b/core/jni/android/graphics/Shader.cpp @@ -119,7 +119,7 @@ static SkShader* LinearGradient_create1(JNIEnv* env, jobject o, const jint* colorValues = env->GetIntArrayElements(colorArray, NULL); SkAutoSTMalloc<8, SkScalar> storage(posArray ? count : 0); - SkScalar* pos = NULL; + SkScalar* pos = NULL; if (posArray) { AutoJavaFloatArray autoPos(env, posArray, count); @@ -164,7 +164,11 @@ static SkiaShader* LinearGradient_postCreate1(JNIEnv* env, jobject o, SkShader* } } else { storedPositions[0] = 0.0f; - storedPositions[1] = 1.0f; + const jfloat step = 1.0f / (count - 1); + for (size_t i = 1; i < count - 1; i++) { + storedPositions[i] = step * i; + } + storedPositions[count - 1] = 1.0f; } SkiaShader* skiaShader = new SkiaLinearGradientShader(storedBounds, storedColors, @@ -289,7 +293,11 @@ static SkiaShader* RadialGradient_postCreate1(JNIEnv* env, jobject o, SkShader* } } else { storedPositions[0] = 0.0f; - storedPositions[1] = 1.0f; + const jfloat step = 1.0f / (count - 1); + for (size_t i = 1; i < count - 1; i++) { + storedPositions[i] = step * i; + } + storedPositions[count - 1] = 1.0f; } SkiaShader* skiaShader = new SkiaCircularGradientShader(x, y, radius, storedColors, @@ -384,7 +392,11 @@ static SkiaShader* SweepGradient_postCreate1(JNIEnv* env, jobject o, SkShader* s } } else { storedPositions[0] = 0.0f; - storedPositions[1] = 1.0f; + const jfloat step = 1.0f / (count - 1); + for (size_t i = 1; i < count - 1; i++) { + storedPositions[i] = step * i; + } + storedPositions[count - 1] = 1.0f; } SkiaShader* skiaShader = new SkiaSweepGradientShader(x, y, storedColors, storedPositions, count, diff --git a/core/jni/android_database_SQLiteDatabase.cpp b/core/jni/android_database_SQLiteDatabase.cpp index a5878a9..e0c900e 100644 --- a/core/jni/android_database_SQLiteDatabase.cpp +++ b/core/jni/android_database_SQLiteDatabase.cpp @@ -64,7 +64,7 @@ enum { static jfieldID offset_db_handle; static jmethodID method_custom_function_callback; -static jclass string_class = NULL; +static jclass string_class; static jint sSqliteSoftHeapLimit = 0; static char *createStr(const char *path, short extra) { @@ -406,8 +406,6 @@ static void custom_function_callback(sqlite3_context * context, int argc, sqlite jobject function = (jobject)sqlite3_user_data(context); // pack up the arguments into a string array - if (!string_class) - string_class = (jclass)env->NewGlobalRef(env->FindClass("java/lang/String")); jobjectArray strArray = env->NewObjectArray(argc, string_class, NULL); if (!strArray) goto done; @@ -425,6 +423,7 @@ static void custom_function_callback(sqlite3_context * context, int argc, sqlite } env->CallVoidMethod(function, method_custom_function_callback, strArray); + env->DeleteLocalRef(strArray); done: if (env->ExceptionCheck()) { @@ -489,6 +488,12 @@ int register_android_database_SQLiteDatabase(JNIEnv *env) return -1; } + string_class = (jclass)env->NewGlobalRef(env->FindClass("java/lang/String")); + if (string_class == NULL) { + LOGE("Can't find java/lang/String\n"); + return -1; + } + offset_db_handle = env->GetFieldID(clazz, "mNativeHandle", "I"); if (offset_db_handle == NULL) { LOGE("Can't find SQLiteDatabase.mNativeHandle\n"); diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index 9e00a7d..09a5fd4 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -680,6 +680,15 @@ static jlong android_os_Binder_clearCallingIdentity(JNIEnv* env, jobject clazz) static void android_os_Binder_restoreCallingIdentity(JNIEnv* env, jobject clazz, jlong token) { + // XXX temporary sanity check to debug crashes. + int uid = (int)(token>>32); + if (uid > 0 && uid < 999) { + // In Android currently there are no uids in this range. + char buf[128]; + sprintf(buf, "Restoring bad calling ident: 0x%Lx", token); + jniThrowException(env, "java/lang/IllegalStateException", buf); + return; + } IPCThreadState::self()->restoreCallingIdentity(token); } diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp index 26c915f..ed93d64 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -497,9 +497,10 @@ static void android_view_GLES20Canvas_destroyDisplayList(JNIEnv* env, } static bool android_view_GLES20Canvas_drawDisplayList(JNIEnv* env, - jobject clazz, OpenGLRenderer* renderer, DisplayList* displayList, jobject dirty) { + jobject clazz, OpenGLRenderer* renderer, DisplayList* displayList, + jint width, jint height, jobject dirty) { android::uirenderer::Rect bounds; - bool redraw = renderer->drawDisplayList(displayList, bounds); + bool redraw = renderer->drawDisplayList(displayList, width, height, bounds); if (redraw && dirty != NULL) { env->CallVoidMethod(dirty, gRectClassInfo.set, int(bounds.left), int(bounds.top), int(bounds.right), int(bounds.bottom)); @@ -663,7 +664,7 @@ static JNINativeMethod gMethods[] = { { "nGetDisplayList", "(I)I", (void*) android_view_GLES20Canvas_getDisplayList }, { "nDestroyDisplayList", "(I)V", (void*) android_view_GLES20Canvas_destroyDisplayList }, { "nGetDisplayListRenderer", "(I)I", (void*) android_view_GLES20Canvas_getDisplayListRenderer }, - { "nDrawDisplayList", "(IILandroid/graphics/Rect;)Z", + { "nDrawDisplayList", "(IIIILandroid/graphics/Rect;)Z", (void*) android_view_GLES20Canvas_drawDisplayList }, { "nInterrupt", "(I)V", (void*) android_view_GLES20Canvas_interrupt }, diff --git a/core/res/res/drawable-hdpi/ic_media_embed_play.png b/core/res/res/drawable-hdpi/ic_media_embed_play.png Binary files differnew file mode 100644 index 0000000..23ac7e4 --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_media_embed_play.png diff --git a/core/res/res/drawable-hdpi/ic_media_ff.png b/core/res/res/drawable-hdpi/ic_media_ff.png Binary files differindex b0dc05b..a892ba2 100644 --- a/core/res/res/drawable-hdpi/ic_media_ff.png +++ b/core/res/res/drawable-hdpi/ic_media_ff.png diff --git a/core/res/res/drawable-hdpi/ic_media_fullscreen.png b/core/res/res/drawable-hdpi/ic_media_fullscreen.png Binary files differnew file mode 100644 index 0000000..0cdbf77 --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_media_fullscreen.png diff --git a/core/res/res/drawable-hdpi/ic_media_next.png b/core/res/res/drawable-hdpi/ic_media_next.png Binary files differindex 2552f4e..2285670 100644 --- a/core/res/res/drawable-hdpi/ic_media_next.png +++ b/core/res/res/drawable-hdpi/ic_media_next.png diff --git a/core/res/res/drawable-hdpi/ic_media_pause.png b/core/res/res/drawable-hdpi/ic_media_pause.png Binary files differindex d4670c2..ffb55cd 100644 --- a/core/res/res/drawable-hdpi/ic_media_pause.png +++ b/core/res/res/drawable-hdpi/ic_media_pause.png diff --git a/core/res/res/drawable-hdpi/ic_media_play.png b/core/res/res/drawable-hdpi/ic_media_play.png Binary files differindex e67ec80..e525bd2 100644 --- a/core/res/res/drawable-hdpi/ic_media_play.png +++ b/core/res/res/drawable-hdpi/ic_media_play.png diff --git a/core/res/res/drawable-hdpi/ic_media_previous.png b/core/res/res/drawable-hdpi/ic_media_previous.png Binary files differindex 05eba71..3333711 100644 --- a/core/res/res/drawable-hdpi/ic_media_previous.png +++ b/core/res/res/drawable-hdpi/ic_media_previous.png diff --git a/core/res/res/drawable-hdpi/ic_media_rew.png b/core/res/res/drawable-hdpi/ic_media_rew.png Binary files differindex 88eed2e..b14e9b9 100644 --- a/core/res/res/drawable-hdpi/ic_media_rew.png +++ b/core/res/res/drawable-hdpi/ic_media_rew.png diff --git a/core/res/res/drawable-hdpi/ic_paste_bubble_disabled_holo.png b/core/res/res/drawable-hdpi/ic_paste_bubble_disabled_holo.png Binary files differnew file mode 100644 index 0000000..42ac16b --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_paste_bubble_disabled_holo.png diff --git a/core/res/res/drawable-hdpi/ic_paste_bubble_holo_disabled.png b/core/res/res/drawable-hdpi/ic_paste_bubble_holo_disabled.png Binary files differdeleted file mode 100644 index 15bd8b2..0000000 --- a/core/res/res/drawable-hdpi/ic_paste_bubble_holo_disabled.png +++ /dev/null diff --git a/core/res/res/drawable-ldpi/ic_media_embed_play.png b/core/res/res/drawable-ldpi/ic_media_embed_play.png Binary files differnew file mode 100644 index 0000000..e7c1972 --- /dev/null +++ b/core/res/res/drawable-ldpi/ic_media_embed_play.png diff --git a/core/res/res/drawable-ldpi/ic_media_fullscreen.png b/core/res/res/drawable-ldpi/ic_media_fullscreen.png Binary files differnew file mode 100644 index 0000000..1a38c38 --- /dev/null +++ b/core/res/res/drawable-ldpi/ic_media_fullscreen.png diff --git a/core/res/res/drawable-mdpi/ic_media_embed_play.png b/core/res/res/drawable-mdpi/ic_media_embed_play.png Binary files differnew file mode 100644 index 0000000..fc5d8c6 --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_media_embed_play.png diff --git a/core/res/res/drawable-mdpi/ic_media_ff.png b/core/res/res/drawable-mdpi/ic_media_ff.png Binary files differindex d99779d..892772e 100644 --- a/core/res/res/drawable-mdpi/ic_media_ff.png +++ b/core/res/res/drawable-mdpi/ic_media_ff.png diff --git a/core/res/res/drawable-mdpi/ic_media_fullscreen.png b/core/res/res/drawable-mdpi/ic_media_fullscreen.png Binary files differnew file mode 100644 index 0000000..1c60e15 --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_media_fullscreen.png diff --git a/core/res/res/drawable-mdpi/ic_media_next.png b/core/res/res/drawable-mdpi/ic_media_next.png Binary files differindex cee4930..bbe311b 100644 --- a/core/res/res/drawable-mdpi/ic_media_next.png +++ b/core/res/res/drawable-mdpi/ic_media_next.png diff --git a/core/res/res/drawable-mdpi/ic_media_pause.png b/core/res/res/drawable-mdpi/ic_media_pause.png Binary files differindex 9e8b675..e4e8d86 100644 --- a/core/res/res/drawable-mdpi/ic_media_pause.png +++ b/core/res/res/drawable-mdpi/ic_media_pause.png diff --git a/core/res/res/drawable-mdpi/ic_media_play.png b/core/res/res/drawable-mdpi/ic_media_play.png Binary files differindex 41cd65f..8eaf962 100644 --- a/core/res/res/drawable-mdpi/ic_media_play.png +++ b/core/res/res/drawable-mdpi/ic_media_play.png diff --git a/core/res/res/drawable-mdpi/ic_media_previous.png b/core/res/res/drawable-mdpi/ic_media_previous.png Binary files differindex 1be95b4..e9abc7f 100644 --- a/core/res/res/drawable-mdpi/ic_media_previous.png +++ b/core/res/res/drawable-mdpi/ic_media_previous.png diff --git a/core/res/res/drawable-mdpi/ic_media_rew.png b/core/res/res/drawable-mdpi/ic_media_rew.png Binary files differindex 8311508..a5eb94a 100644 --- a/core/res/res/drawable-mdpi/ic_media_rew.png +++ b/core/res/res/drawable-mdpi/ic_media_rew.png diff --git a/core/res/res/drawable-mdpi/ic_paste_bubble_disabled_holo.png b/core/res/res/drawable-mdpi/ic_paste_bubble_disabled_holo.png Binary files differnew file mode 100644 index 0000000..ce6bd86 --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_paste_bubble_disabled_holo.png diff --git a/core/res/res/drawable-mdpi/ic_paste_bubble_holo_disabled.png b/core/res/res/drawable-mdpi/ic_paste_bubble_holo_disabled.png Binary files differdeleted file mode 100644 index e483e84..0000000 --- a/core/res/res/drawable-mdpi/ic_paste_bubble_holo_disabled.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/textfield_search_default_holo_dark.9.png b/core/res/res/drawable-mdpi/textfield_search_default_holo_dark.9.png Binary files differindex b7413b3..62e3274 100644 --- a/core/res/res/drawable-mdpi/textfield_search_default_holo_dark.9.png +++ b/core/res/res/drawable-mdpi/textfield_search_default_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/textfield_search_default_holo_light.9.png b/core/res/res/drawable-mdpi/textfield_search_default_holo_light.9.png Binary files differindex 82e7a03..b7512fa 100644 --- a/core/res/res/drawable-mdpi/textfield_search_default_holo_light.9.png +++ b/core/res/res/drawable-mdpi/textfield_search_default_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/textfield_search_right_default_holo_dark.9.png b/core/res/res/drawable-mdpi/textfield_search_right_default_holo_dark.9.png Binary files differindex 4b0ea21..bfc6f83 100644 --- a/core/res/res/drawable-mdpi/textfield_search_right_default_holo_dark.9.png +++ b/core/res/res/drawable-mdpi/textfield_search_right_default_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/textfield_search_right_default_holo_light.9.png b/core/res/res/drawable-mdpi/textfield_search_right_default_holo_light.9.png Binary files differindex e87591c..708ba90 100644 --- a/core/res/res/drawable-mdpi/textfield_search_right_default_holo_light.9.png +++ b/core/res/res/drawable-mdpi/textfield_search_right_default_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/textfield_search_right_selected_holo_dark.9.png b/core/res/res/drawable-mdpi/textfield_search_right_selected_holo_dark.9.png Binary files differindex 14f69b1..0da1e9c 100644 --- a/core/res/res/drawable-mdpi/textfield_search_right_selected_holo_dark.9.png +++ b/core/res/res/drawable-mdpi/textfield_search_right_selected_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/textfield_search_right_selected_holo_light.9.png b/core/res/res/drawable-mdpi/textfield_search_right_selected_holo_light.9.png Binary files differindex 85329ca..2e93557 100644 --- a/core/res/res/drawable-mdpi/textfield_search_right_selected_holo_light.9.png +++ b/core/res/res/drawable-mdpi/textfield_search_right_selected_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/textfield_search_selected_holo_dark.9.png b/core/res/res/drawable-mdpi/textfield_search_selected_holo_dark.9.png Binary files differindex 7e130d9..7aeaad6 100644 --- a/core/res/res/drawable-mdpi/textfield_search_selected_holo_dark.9.png +++ b/core/res/res/drawable-mdpi/textfield_search_selected_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/textfield_search_selected_holo_light.9.png b/core/res/res/drawable-mdpi/textfield_search_selected_holo_light.9.png Binary files differindex 050d1c0..cf46f32 100644 --- a/core/res/res/drawable-mdpi/textfield_search_selected_holo_light.9.png +++ b/core/res/res/drawable-mdpi/textfield_search_selected_holo_light.9.png diff --git a/core/res/res/layout/search_view.xml b/core/res/res/layout/search_view.xml index c52b73f..face8b2 100644 --- a/core/res/res/layout/search_view.xml +++ b/core/res/res/layout/search_view.xml @@ -54,8 +54,8 @@ android:layout_height="wrap_content" android:layout_weight="1" android:layout_gravity="center_vertical" - android:layout_marginLeft="4dip" - android:layout_marginRight="4dip" + android:layout_marginLeft="16dip" + android:layout_marginRight="16dip" android:layout_marginTop="4dip" android:layout_marginBottom="4dip" android:orientation="horizontal"> diff --git a/core/res/res/layout/text_edit_no_paste_window.xml b/core/res/res/layout/text_edit_no_paste_window.xml index f804986..98b16e2 100644 --- a/core/res/res/layout/text_edit_no_paste_window.xml +++ b/core/res/res/layout/text_edit_no_paste_window.xml @@ -25,7 +25,7 @@ android:paddingRight="16dip" android:paddingTop="8dip" android:paddingBottom="8dip" - android:drawableLeft="@android:drawable/ic_paste_bubble_holo_disabled" + android:drawableLeft="@android:drawable/ic_paste_bubble_disabled_holo" android:drawablePadding="8dip" android:gravity="center" android:textAppearance="?android:attr/textAppearanceMediumInverse" diff --git a/core/res/res/layout/text_edit_side_no_paste_window.xml b/core/res/res/layout/text_edit_side_no_paste_window.xml index 903bcb6..3eb41fb 100644 --- a/core/res/res/layout/text_edit_side_no_paste_window.xml +++ b/core/res/res/layout/text_edit_side_no_paste_window.xml @@ -25,7 +25,7 @@ android:paddingRight="16dip" android:paddingTop="8dip" android:paddingBottom="8dip" - android:drawableLeft="@android:drawable/ic_paste_bubble_holo_disabled" + android:drawableLeft="@android:drawable/ic_paste_bubble_disabled_holo" android:drawablePadding="8dip" android:gravity="center" android:textAppearance="?android:attr/textAppearanceMediumInverse" diff --git a/core/res/res/raw-ar-xlarge/incognito_mode_start_page.html b/core/res/res/raw-ar-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..002be41 --- /dev/null +++ b/core/res/res/raw-ar-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="RTL"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>نافذة جديدة للتصفح المتخفي</title> + </head> + <body> + <p><strong>أنت الآن في وضع التصفح المتخفي</strong> الصفحات التي تشاهدها في هذه النافذة لن تظهر في سجل المتصفح أو سجلّ البحث، ولن تترك آثارًا أخرى للتتبع، مثل ملفات تعريف الارتباط على جهازك بعد أن تغلق نافذة التصفح المتخفي. ورغم ذلك، سيتم الاحتفاظ بأي ملفات تنزلها أو أية إشارات مرجعية تقوم بإنشائها.</p> + + <p><strong>العمل في وضع التصفح المخفي لا يؤثر على طريقة عمل الأشخاص الآخرين أو الخوادم أو البرامج الأخرى. كن على حذر مما يلي:</strong></p> + + <ul> + <li>مواقع الويب التي تجمع معلومات عنك أو تشارك الآخرين فيها</li> + <li>مزوّدو خدمة الإنترنت أو الموظفون الذين يتتبعون الصفحات التي تزورها</li> + <li>البرامج الضارة التي تتبع ضغطات المفاتيح التي تقوم بها مقابل تنزيل وجوه رمزية مجانًا</li> + <li>المراقبة من قبل العملاء السريين</li> + <li>الأشخاص الذين يقفون خلفك</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-ar/incognito_mode_start_page.html b/core/res/res/raw-ar/incognito_mode_start_page.html new file mode 100644 index 0000000..002be41 --- /dev/null +++ b/core/res/res/raw-ar/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="RTL"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>نافذة جديدة للتصفح المتخفي</title> + </head> + <body> + <p><strong>أنت الآن في وضع التصفح المتخفي</strong> الصفحات التي تشاهدها في هذه النافذة لن تظهر في سجل المتصفح أو سجلّ البحث، ولن تترك آثارًا أخرى للتتبع، مثل ملفات تعريف الارتباط على جهازك بعد أن تغلق نافذة التصفح المتخفي. ورغم ذلك، سيتم الاحتفاظ بأي ملفات تنزلها أو أية إشارات مرجعية تقوم بإنشائها.</p> + + <p><strong>العمل في وضع التصفح المخفي لا يؤثر على طريقة عمل الأشخاص الآخرين أو الخوادم أو البرامج الأخرى. كن على حذر مما يلي:</strong></p> + + <ul> + <li>مواقع الويب التي تجمع معلومات عنك أو تشارك الآخرين فيها</li> + <li>مزوّدو خدمة الإنترنت أو الموظفون الذين يتتبعون الصفحات التي تزورها</li> + <li>البرامج الضارة التي تتبع ضغطات المفاتيح التي تقوم بها مقابل تنزيل وجوه رمزية مجانًا</li> + <li>المراقبة من قبل العملاء السريين</li> + <li>الأشخاص الذين يقفون خلفك</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-bg-xlarge/incognito_mode_start_page.html b/core/res/res/raw-bg-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..ee25ae4 --- /dev/null +++ b/core/res/res/raw-bg-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Нов прозорец „инкогнито“</title> + </head> + <body> + <p><strong>Влязохте в режим „инкогнито“</strong>. Страниците, които разглеждате в този прозорец, няма да се показват в историята на браузъра ви, нито в историята на търсенията ви. Те също няма да оставят други следи като „бисквитки“ в устройството ви, след като затворите прозореца в режим „инкогнито“. Ще се съхранят обаче всички файлове, които изтеглите, или отметки, които създадете.</p> + + <p><strong>Преминаването в режим „инкогнито“ не засяга поведението на други хора, сървъри или софтуер. </strong>Внимавайте за:</p> + + <ul> + <li>уебсайтове, които събират или споделят информация за вас;</li> + <li>доставчици на интернет услуги или служители, които проследяват посещаваните от вас страници;</li> + <li>злонамерен софтуер, който ви дава безплатни емотикони, но в замяна проследява натисканията на клавишите от вас;</li> + <li>наблюдение от тайните служби;</li> + <li>хора, които стоят зад вас.</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-bg/incognito_mode_start_page.html b/core/res/res/raw-bg/incognito_mode_start_page.html new file mode 100644 index 0000000..ee25ae4 --- /dev/null +++ b/core/res/res/raw-bg/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Нов прозорец „инкогнито“</title> + </head> + <body> + <p><strong>Влязохте в режим „инкогнито“</strong>. Страниците, които разглеждате в този прозорец, няма да се показват в историята на браузъра ви, нито в историята на търсенията ви. Те също няма да оставят други следи като „бисквитки“ в устройството ви, след като затворите прозореца в режим „инкогнито“. Ще се съхранят обаче всички файлове, които изтеглите, или отметки, които създадете.</p> + + <p><strong>Преминаването в режим „инкогнито“ не засяга поведението на други хора, сървъри или софтуер. </strong>Внимавайте за:</p> + + <ul> + <li>уебсайтове, които събират или споделят информация за вас;</li> + <li>доставчици на интернет услуги или служители, които проследяват посещаваните от вас страници;</li> + <li>злонамерен софтуер, който ви дава безплатни емотикони, но в замяна проследява натисканията на клавишите от вас;</li> + <li>наблюдение от тайните служби;</li> + <li>хора, които стоят зад вас.</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-ca-xlarge/incognito_mode_start_page.html b/core/res/res/raw-ca-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..bec3dac --- /dev/null +++ b/core/res/res/raw-ca-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nova finestra d'incògnit</title> + </head> + <body> + <p><strong>Has passat a l'estat d'incògnit</strong>. Les pàgines que visualitzis en aquesta finestra no apareixeran a l'historial del navegador ni a l'historial de cerques, i no deixaran cap pista, com ara galetes, al dispositiu després de tancar la finestra d'incògnit. Tanmateix, es conservaran tots els fitxers que baixis o les adreces d'interès que creïs.</p> + + <p><strong>Utilitzar el mode d'incògnit no afecta el comportament d'altres usuaris, servidors ni programari. Vés amb compte amb:</strong></p> + + <ul> + <li>llocs web que recopilen o comparteixen informació sobre la teva identitat,</li> + <li>proveïdors de serveis d'Internet o treballadors que segueixen les pàgines que visites,</li> + <li>programari maliciós que segueix les teves pulsacions del teclat a canvi d'emoticones,</li> + <li>vigilància per part d'agents secrets,</li> + <li>persones que estan darrere teu.</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-ca/incognito_mode_start_page.html b/core/res/res/raw-ca/incognito_mode_start_page.html new file mode 100644 index 0000000..bec3dac --- /dev/null +++ b/core/res/res/raw-ca/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nova finestra d'incògnit</title> + </head> + <body> + <p><strong>Has passat a l'estat d'incògnit</strong>. Les pàgines que visualitzis en aquesta finestra no apareixeran a l'historial del navegador ni a l'historial de cerques, i no deixaran cap pista, com ara galetes, al dispositiu després de tancar la finestra d'incògnit. Tanmateix, es conservaran tots els fitxers que baixis o les adreces d'interès que creïs.</p> + + <p><strong>Utilitzar el mode d'incògnit no afecta el comportament d'altres usuaris, servidors ni programari. Vés amb compte amb:</strong></p> + + <ul> + <li>llocs web que recopilen o comparteixen informació sobre la teva identitat,</li> + <li>proveïdors de serveis d'Internet o treballadors que segueixen les pàgines que visites,</li> + <li>programari maliciós que segueix les teves pulsacions del teclat a canvi d'emoticones,</li> + <li>vigilància per part d'agents secrets,</li> + <li>persones que estan darrere teu.</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-cs-xlarge/incognito_mode_start_page.html b/core/res/res/raw-cs-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..7420393 --- /dev/null +++ b/core/res/res/raw-cs-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nové anonymní okno</title> + </head> + <body> + <p><strong>Spustili jste anonymní režim</strong>. Stránky, které zobrazíte v tomto okně, se nezahrnou do historie prohlížeče ani historie vyhledávání a dokonce po zavření tohoto anonymního okna ve vašem zařízení nezanechají ani žádné jiné stopy například v podobě souborů cookie. Veškeré stažené soubory nebo vytvořené záložky však budou zachovány.</p> + + <p><strong>Použití anonymního režimu nemá vliv na chování jiných osob, serverů nebo softwaru. Dejte si pozor na:</strong></p> + + <ul> + <li>Weby, které sbírají nebo sdílejí informace o vás</li> + <li>Poskytovatele internetových služeb nebo zaměstnavatele, kteří sledují stránky, které navštěvujete</li> + <li>Škodlivý software, který sleduje stisknuté klávesy a výměnou nabízí nové emotikony</li> + <li>Tajné agenty</li> + <li>Lidi, kteří vám koukají přes rameno</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-cs/incognito_mode_start_page.html b/core/res/res/raw-cs/incognito_mode_start_page.html new file mode 100644 index 0000000..7420393 --- /dev/null +++ b/core/res/res/raw-cs/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nové anonymní okno</title> + </head> + <body> + <p><strong>Spustili jste anonymní režim</strong>. Stránky, které zobrazíte v tomto okně, se nezahrnou do historie prohlížeče ani historie vyhledávání a dokonce po zavření tohoto anonymního okna ve vašem zařízení nezanechají ani žádné jiné stopy například v podobě souborů cookie. Veškeré stažené soubory nebo vytvořené záložky však budou zachovány.</p> + + <p><strong>Použití anonymního režimu nemá vliv na chování jiných osob, serverů nebo softwaru. Dejte si pozor na:</strong></p> + + <ul> + <li>Weby, které sbírají nebo sdílejí informace o vás</li> + <li>Poskytovatele internetových služeb nebo zaměstnavatele, kteří sledují stránky, které navštěvujete</li> + <li>Škodlivý software, který sleduje stisknuté klávesy a výměnou nabízí nové emotikony</li> + <li>Tajné agenty</li> + <li>Lidi, kteří vám koukají přes rameno</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-da-xlarge/incognito_mode_start_page.html b/core/res/res/raw-da-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..eae989f --- /dev/null +++ b/core/res/res/raw-da-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nyt inkognitovindue</title> + </head> + <body> + <p><strong>Nu er du inkognito</strong>. De sider, du besøger i dette vindue, vises ikke i din browser- eller søgeoversigt, og de efterlader ikke andre spor, såsom cookies, på din enhed, når du lukker incognitovinduet. Filer, som du downloader eller bogmærker, som du opretter, gemmes dog.</p> + + <p><strong>At være inkognito er ikke noget, der påvirker andre folk, servere eller software. Vær opmærksom på:</strong></p> + + <ul> + <li>Websider, der indsamler eller deler oplysninger om dig</li> + <li>Internetserviceudbydere eller arbejdsgivere, der registrerer de sider, du besøger</li> + <li>Ondsindet software, der registrerer dine tasteslag til gengæld for gratis smileys</li> + <li>Overvågning af hemmelige agenter</li> + <li>Folk, der kigger dig over skulderen</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-da/incognito_mode_start_page.html b/core/res/res/raw-da/incognito_mode_start_page.html new file mode 100644 index 0000000..eae989f --- /dev/null +++ b/core/res/res/raw-da/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nyt inkognitovindue</title> + </head> + <body> + <p><strong>Nu er du inkognito</strong>. De sider, du besøger i dette vindue, vises ikke i din browser- eller søgeoversigt, og de efterlader ikke andre spor, såsom cookies, på din enhed, når du lukker incognitovinduet. Filer, som du downloader eller bogmærker, som du opretter, gemmes dog.</p> + + <p><strong>At være inkognito er ikke noget, der påvirker andre folk, servere eller software. Vær opmærksom på:</strong></p> + + <ul> + <li>Websider, der indsamler eller deler oplysninger om dig</li> + <li>Internetserviceudbydere eller arbejdsgivere, der registrerer de sider, du besøger</li> + <li>Ondsindet software, der registrerer dine tasteslag til gengæld for gratis smileys</li> + <li>Overvågning af hemmelige agenter</li> + <li>Folk, der kigger dig over skulderen</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-de-xlarge/incognito_mode_start_page.html b/core/res/res/raw-de-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..1d2cb69 --- /dev/null +++ b/core/res/res/raw-de-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Neues Inkognito-Fenster</title> + </head> + <body> + <p><strong>Sie haben den Modus für anonymes Browsen aktiviert</strong>. In diesem Fenster aufgerufene Seiten erscheinen nicht in Ihrem Browser- oder Suchverlauf. Zudem werden nach dem Schließen des Inkognito-Fensters keine anderen Spuren wie etwa Cookies auf Ihrem Gerät gespeichert. Heruntergeladene Dateien oder hinzugefügte Lesezeichen werden jedoch beibehalten.</p> + + <p><strong>Das anonyme Browsen wirkt sich nicht auf das Verhalten von Menschen, Servern oder Software aus. </strong>Vorsicht ist geboten bei:</p> + + <ul> + <li>Websites, auf denen Informationen über Sie gesammelt oder weitergegeben werden</li> + <li>Internetanbietern oder Arbeitgebern, die die von Ihnen aufgerufenen Seiten protokollieren</li> + <li>Bösartiger Software, die Ihnen kostenlose Smileys bietet, dafür aber Ihre Tastatureingaben speichert</li> + <li>Geheimagenten</li> + <li>Personen, die hinter Ihnen stehen</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-de/incognito_mode_start_page.html b/core/res/res/raw-de/incognito_mode_start_page.html new file mode 100644 index 0000000..1d2cb69 --- /dev/null +++ b/core/res/res/raw-de/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Neues Inkognito-Fenster</title> + </head> + <body> + <p><strong>Sie haben den Modus für anonymes Browsen aktiviert</strong>. In diesem Fenster aufgerufene Seiten erscheinen nicht in Ihrem Browser- oder Suchverlauf. Zudem werden nach dem Schließen des Inkognito-Fensters keine anderen Spuren wie etwa Cookies auf Ihrem Gerät gespeichert. Heruntergeladene Dateien oder hinzugefügte Lesezeichen werden jedoch beibehalten.</p> + + <p><strong>Das anonyme Browsen wirkt sich nicht auf das Verhalten von Menschen, Servern oder Software aus. </strong>Vorsicht ist geboten bei:</p> + + <ul> + <li>Websites, auf denen Informationen über Sie gesammelt oder weitergegeben werden</li> + <li>Internetanbietern oder Arbeitgebern, die die von Ihnen aufgerufenen Seiten protokollieren</li> + <li>Bösartiger Software, die Ihnen kostenlose Smileys bietet, dafür aber Ihre Tastatureingaben speichert</li> + <li>Geheimagenten</li> + <li>Personen, die hinter Ihnen stehen</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-el-xlarge/incognito_mode_start_page.html b/core/res/res/raw-el-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..5641650 --- /dev/null +++ b/core/res/res/raw-el-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Νέο παράθυρο για ανώνυμη περιήγηση</title> + </head> + <body> + <p><strong>Είστε σε κατάσταση ανώνυμης περιήγησης</strong>. Οι σελίδες που θα προβάλλετε σε αυτό το παράθυρο δεν θα εμφανιστούν στο ιστορικό του πρόγράμματος περιήγησης ή στο ιστορικό αναζήτησης. Επίσης, δεν θα αφήσουν ίχνη, όπως cookie, στη συσκευή σας αφού κλείσετε το παράθυρο ανώνυμης περιήγησης. Ωστόσο, τα αρχεία και οι σελιδοδείκτες που θα δημιουργήσετε θα διατηρηθούν.</p> + + <p><strong>Η κατάσταση ανώνυμης περιήγησης δεν επηρεάζει την συμπεριφορά άλλων, διακομιστών ή λογισμικού. Αλλά προσοχή σε:</strong></p> + + <ul> + <li>Ιστοτόπους που συλλέγουν ή μοιράζονται πληροφορίες για εσάς</li> + <li>Πάροχους υπηρεσιών διαδικτύου ή εργοδότες που παρακολουθούν τις ιστοσελίδες που επισκέπτεστε</li> + <li>Κακόβουλο λογισμικό που καταγράφει ότι πληκτρολογείτε με αντάλλαγμα δωρεάν "φατσούλες"</li> + <li>Παρακολούθηση από μυστικούς πράκτορες</li> + <li>Άτομα που στέκονται πίσω σας</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-el/incognito_mode_start_page.html b/core/res/res/raw-el/incognito_mode_start_page.html new file mode 100644 index 0000000..5641650 --- /dev/null +++ b/core/res/res/raw-el/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Νέο παράθυρο για ανώνυμη περιήγηση</title> + </head> + <body> + <p><strong>Είστε σε κατάσταση ανώνυμης περιήγησης</strong>. Οι σελίδες που θα προβάλλετε σε αυτό το παράθυρο δεν θα εμφανιστούν στο ιστορικό του πρόγράμματος περιήγησης ή στο ιστορικό αναζήτησης. Επίσης, δεν θα αφήσουν ίχνη, όπως cookie, στη συσκευή σας αφού κλείσετε το παράθυρο ανώνυμης περιήγησης. Ωστόσο, τα αρχεία και οι σελιδοδείκτες που θα δημιουργήσετε θα διατηρηθούν.</p> + + <p><strong>Η κατάσταση ανώνυμης περιήγησης δεν επηρεάζει την συμπεριφορά άλλων, διακομιστών ή λογισμικού. Αλλά προσοχή σε:</strong></p> + + <ul> + <li>Ιστοτόπους που συλλέγουν ή μοιράζονται πληροφορίες για εσάς</li> + <li>Πάροχους υπηρεσιών διαδικτύου ή εργοδότες που παρακολουθούν τις ιστοσελίδες που επισκέπτεστε</li> + <li>Κακόβουλο λογισμικό που καταγράφει ότι πληκτρολογείτε με αντάλλαγμα δωρεάν "φατσούλες"</li> + <li>Παρακολούθηση από μυστικούς πράκτορες</li> + <li>Άτομα που στέκονται πίσω σας</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-en-rGB-xlarge/incognito_mode_start_page.html b/core/res/res/raw-en-rGB-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..7436f98 --- /dev/null +++ b/core/res/res/raw-en-rGB-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>New incognito window</title> + </head> + <body> + <p><strong>You've gone incognito</strong>. Pages that you view in this window won't appear in your browser history or search history, and they won't leave other traces, such as cookies, on your device after you close the incognito window. However, any files that you download or bookmarks that you create will be preserved.</p> + + <p><strong>Going incognito doesn't affect the behaviour of other people, servers or software. Be cautious of:</strong></p> + + <ul> + <li>Websites that collect or share information about you</li> + <li>Internet service providers or employers that track the pages that you visit</li> + <li>Malicious software that tracks your keystrokes in exchange for free smileys</li> + <li>Surveillance by secret agents</li> + <li>People standing behind you</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-en-rGB/incognito_mode_start_page.html b/core/res/res/raw-en-rGB/incognito_mode_start_page.html new file mode 100644 index 0000000..7436f98 --- /dev/null +++ b/core/res/res/raw-en-rGB/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>New incognito window</title> + </head> + <body> + <p><strong>You've gone incognito</strong>. Pages that you view in this window won't appear in your browser history or search history, and they won't leave other traces, such as cookies, on your device after you close the incognito window. However, any files that you download or bookmarks that you create will be preserved.</p> + + <p><strong>Going incognito doesn't affect the behaviour of other people, servers or software. Be cautious of:</strong></p> + + <ul> + <li>Websites that collect or share information about you</li> + <li>Internet service providers or employers that track the pages that you visit</li> + <li>Malicious software that tracks your keystrokes in exchange for free smileys</li> + <li>Surveillance by secret agents</li> + <li>People standing behind you</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-es-rUS-xlarge/incognito_mode_start_page.html b/core/res/res/raw-es-rUS-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..d283df5 --- /dev/null +++ b/core/res/res/raw-es-rUS-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nueva ventana de incógnito</title> + </head> + <body> + <p><strong>Estás de incógnito</strong>. Las páginas que veas en esta ventana no aparecerán en el historial de tu navegador ni en el historial de búsquedas, y cuando cierres la ventana de incógnito, tampoco quedará ningún otro rastro, como cookies, en tu dispositivo. Sin embargo, sí se preservarán los archivos que descargues o los favoritos que marques.</p> + + <p><strong>Estar de incógnito no afecta el comportamiento de otras personas, servidores o programas. Ten cuidado con:</strong></p> + + <ul> + <li>Sitios web que recaban o comparten tu información</li> + <li>Proveedores de servicio de Internet o empleadores que hacen un seguimiento de las páginas que visitas</li> + <li>Programas de software maliciosos que hacen un seguimiento de la actividad de tu teclado a cambio de emoticones gratuitos</li> + <li>Vigilancia a cargo de agentes secretos</li> + <li>Personas paradas atrás tuyo</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-es-rUS/incognito_mode_start_page.html b/core/res/res/raw-es-rUS/incognito_mode_start_page.html new file mode 100644 index 0000000..d283df5 --- /dev/null +++ b/core/res/res/raw-es-rUS/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nueva ventana de incógnito</title> + </head> + <body> + <p><strong>Estás de incógnito</strong>. Las páginas que veas en esta ventana no aparecerán en el historial de tu navegador ni en el historial de búsquedas, y cuando cierres la ventana de incógnito, tampoco quedará ningún otro rastro, como cookies, en tu dispositivo. Sin embargo, sí se preservarán los archivos que descargues o los favoritos que marques.</p> + + <p><strong>Estar de incógnito no afecta el comportamiento de otras personas, servidores o programas. Ten cuidado con:</strong></p> + + <ul> + <li>Sitios web que recaban o comparten tu información</li> + <li>Proveedores de servicio de Internet o empleadores que hacen un seguimiento de las páginas que visitas</li> + <li>Programas de software maliciosos que hacen un seguimiento de la actividad de tu teclado a cambio de emoticones gratuitos</li> + <li>Vigilancia a cargo de agentes secretos</li> + <li>Personas paradas atrás tuyo</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-es-xlarge/incognito_mode_start_page.html b/core/res/res/raw-es-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..6d9b501 --- /dev/null +++ b/core/res/res/raw-es-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nueva ventana de incógnito</title> + </head> + <body> + <p><strong>Estás navegando de incógnito</strong>. Las páginas que consultes a través de esta ventana no quedarán registradas en el historial del navegador ni en el historial de búsquedas, y tampoco dejarán otros rastros en el ordenador (como cookies) una vez cerrada. Los archivos que descargues y los marcadores que guardes sí se almacenarán. </p> + + <p><strong>La función de navegación de incógnito no afecta al comportamiento de los servidores o programas de software. Ten cuidado con:</strong></p> + + <ul> + <li>sitios web que recopilan o comparten información personal</li> + <li>proveedores de servicios de Internet o trabajadores de estas empresas que supervisan las páginas que visitas</li> + <li>software malicioso que realiza un seguimiento de las teclas que pulsas a cambio de emoticonos gratuitos</li> + <li>actividades de seguimiento por parte de terceros</li> + <li>personas merodeando cerca de tu ordenador</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-es/incognito_mode_start_page.html b/core/res/res/raw-es/incognito_mode_start_page.html index 43fd37f..6d9b501 100644 --- a/core/res/res/raw-es/incognito_mode_start_page.html +++ b/core/res/res/raw-es/incognito_mode_start_page.html @@ -1,26 +1,19 @@ -<html> +<html DIR="LTR"> <head> - <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> <title>Nueva ventana de incógnito</title> </head> <body> - <p><strong>Has entrado en el modo "Navegar de incógnito"</strong>. Las páginas - que consultes a través de esta ventana no quedarán registradas en el historial del navegador - ni en el historial de búsquedas, y tampoco dejarán otros rastros en el equipo (como cookies) - una vez cerrada. Aunque sí quedarán almacenados los archivos que descargues y los marcadores - que guardes durante la sesión.</p> + <p><strong>Estás navegando de incógnito</strong>. Las páginas que consultes a través de esta ventana no quedarán registradas en el historial del navegador ni en el historial de búsquedas, y tampoco dejarán otros rastros en el ordenador (como cookies) una vez cerrada. Los archivos que descargues y los marcadores que guardes sí se almacenarán. </p> - <p><strong>La función "Navegar de incógnito" no afecta al comportamiento de - otros usuarios, servidores o programas. Atención con:</strong></p> + <p><strong>La función de navegación de incógnito no afecta al comportamiento de los servidores o programas de software. Ten cuidado con:</strong></p> <ul> - <li>sitios web que recopilan o comparten información personal,</li> - <li>proveedores de servicios de Internet o trabajadores de estas empresas que - supervisan las páginas que visita el usuario,</li> - <li>software malicioso que realiza un seguimiento de las teclas que pulsa el usuario a - cambio de unos emoticones gratuitos,</li> - <li>el seguimiento por parte de detectives privados,</li> - <li>personas merodeando cerca de tu equipo.</li> + <li>sitios web que recopilan o comparten información personal</li> + <li>proveedores de servicios de Internet o trabajadores de estas empresas que supervisan las páginas que visitas</li> + <li>software malicioso que realiza un seguimiento de las teclas que pulsas a cambio de emoticonos gratuitos</li> + <li>actividades de seguimiento por parte de terceros</li> + <li>personas merodeando cerca de tu ordenador</li> </ul> </body> </html> diff --git a/core/res/res/raw-fa-xlarge/incognito_mode_start_page.html b/core/res/res/raw-fa-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..f004120 --- /dev/null +++ b/core/res/res/raw-fa-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="RTL"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>پنجره ناشناس جدید</title> + </head> + <body> + <p><strong>شما به صورت ناشناس وارد شده اید</strong> صفحاتی که شما در این پنجره مشاهده میکنید در سابقه مرورگر یا سابقه جستجوی شما ظاهر نمیشوند، و پس از بستن پنجره ناشناس، دنباله ای از خود مانند کوکی ها روی دستگاه شما بر جای نمیگذارند. به هر حال، فایل های دانلود شده و نشانکهای صفحه ای که ایجاد کرده اید باقی خواهند ماند.</p> + + <p><strong>وارد شدن به صورت ناشناس، تاثیری بر روی رفتار افراد دیگر، سرورها و یا نرم افزارها ندارد. در خصوص موارد زیر هشیار باشید:</strong></p> + + <ul> + <li>وبسایت هایی که اطلاعاتی را در مورد شما جمع آوری کرده و به اشتراک میگذارند</li> + <li>تامین کننده های خدمات اینترنتی شما یا کارمندانی که صفحاتی که شما بازدید کرده اید را پیگیری میکنند</li> + <li>نرم افزارهای مخربی که در ازای نشانک های رایگان، ضربات کلیدهای شما را ذخیره میکنند</li> + <li>نظارت توسط نمایندگان سری</li> + <li>افرادی که پشت سرتان ایستاده اند</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-fa/incognito_mode_start_page.html b/core/res/res/raw-fa/incognito_mode_start_page.html new file mode 100644 index 0000000..f004120 --- /dev/null +++ b/core/res/res/raw-fa/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="RTL"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>پنجره ناشناس جدید</title> + </head> + <body> + <p><strong>شما به صورت ناشناس وارد شده اید</strong> صفحاتی که شما در این پنجره مشاهده میکنید در سابقه مرورگر یا سابقه جستجوی شما ظاهر نمیشوند، و پس از بستن پنجره ناشناس، دنباله ای از خود مانند کوکی ها روی دستگاه شما بر جای نمیگذارند. به هر حال، فایل های دانلود شده و نشانکهای صفحه ای که ایجاد کرده اید باقی خواهند ماند.</p> + + <p><strong>وارد شدن به صورت ناشناس، تاثیری بر روی رفتار افراد دیگر، سرورها و یا نرم افزارها ندارد. در خصوص موارد زیر هشیار باشید:</strong></p> + + <ul> + <li>وبسایت هایی که اطلاعاتی را در مورد شما جمع آوری کرده و به اشتراک میگذارند</li> + <li>تامین کننده های خدمات اینترنتی شما یا کارمندانی که صفحاتی که شما بازدید کرده اید را پیگیری میکنند</li> + <li>نرم افزارهای مخربی که در ازای نشانک های رایگان، ضربات کلیدهای شما را ذخیره میکنند</li> + <li>نظارت توسط نمایندگان سری</li> + <li>افرادی که پشت سرتان ایستاده اند</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-fi-xlarge/incognito_mode_start_page.html b/core/res/res/raw-fi-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..feb9f4f --- /dev/null +++ b/core/res/res/raw-fi-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Uusi incognito-ikkuna</title> + </head> + <body> + <p><strong>Olet nyt incognito-tilassa</strong>. Incognito-tilassa katsellut sivut eivät näy selainhistoriassa eikä hakuhistoriassa. Ne eivät myöskään jätä muita jälkiä, kuten evästeitä, sivun sulkemisen jälkeen. Lataamasi tiedostot tai luomasi kirjanmerkit tosin tallentuvat.</p> + + <p><strong>Incognito-tilaan siirtyminen ei vaikuta muiden ihmisten, palvelimien tai tietokoneohjelmien toimintaan. Varo:</strong></p> + + <ul> + <li>Verkkosivustoja jotka keräävät sinusta tietoa ja/tai jakavat sitä eteenpäin</li> + <li>Internet-palveluntarjoajia ja työnantajia jotka seuraavat sivuja, joilla käyt</li> + <li>Haittaohjelmia jotka seuraavat näppäimistön toimintaa ja tarjoavat vastineeksi ilmaisia hymiöitä</li> + <li>Salaisten agenttien seurantaa</li> + <li>Ihmisiä jotka seisovat takanasi</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-fi/incognito_mode_start_page.html b/core/res/res/raw-fi/incognito_mode_start_page.html new file mode 100644 index 0000000..feb9f4f --- /dev/null +++ b/core/res/res/raw-fi/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Uusi incognito-ikkuna</title> + </head> + <body> + <p><strong>Olet nyt incognito-tilassa</strong>. Incognito-tilassa katsellut sivut eivät näy selainhistoriassa eikä hakuhistoriassa. Ne eivät myöskään jätä muita jälkiä, kuten evästeitä, sivun sulkemisen jälkeen. Lataamasi tiedostot tai luomasi kirjanmerkit tosin tallentuvat.</p> + + <p><strong>Incognito-tilaan siirtyminen ei vaikuta muiden ihmisten, palvelimien tai tietokoneohjelmien toimintaan. Varo:</strong></p> + + <ul> + <li>Verkkosivustoja jotka keräävät sinusta tietoa ja/tai jakavat sitä eteenpäin</li> + <li>Internet-palveluntarjoajia ja työnantajia jotka seuraavat sivuja, joilla käyt</li> + <li>Haittaohjelmia jotka seuraavat näppäimistön toimintaa ja tarjoavat vastineeksi ilmaisia hymiöitä</li> + <li>Salaisten agenttien seurantaa</li> + <li>Ihmisiä jotka seisovat takanasi</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-fr-xlarge/incognito_mode_start_page.html b/core/res/res/raw-fr-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..8962cdf --- /dev/null +++ b/core/res/res/raw-fr-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nouvelle fenêtre de navigation privée</title> + </head> + <body> + <p><strong>Vous êtes passé en navigation privée</strong>. Les pages que vous consultez dans cette fenêtre n'apparaîtront ni dans l'historique de votre navigateur, ni dans l'historique des recherches, et ne laisseront aucune trace (comme les cookies) sur votre appareil une fois que vous aurez fermé la fenêtre de navigation privée. Tous les fichiers téléchargés et les favoris créés seront toutefois conservés.</p> + + <p><strong>Passer en navigation privée n'a aucun effet sur les autres utilisateurs, serveurs ou logiciels. Méfiez-vous :</strong></p> + + <ul> + <li>Des sites Web qui collectent ou partagent des informations vous concernant</li> + <li>Des fournisseurs d'accès Internet ou des employeurs qui conservent une trace des pages que vous visitez</li> + <li>Des programmes indésirables qui enregistrent vos frappes en échange d'émoticônes gratuites</li> + <li>Des personnes qui pourraient surveiller vos activités</li> + <li>Des personnes qui se tiennent derrière vous</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-fr/incognito_mode_start_page.html b/core/res/res/raw-fr/incognito_mode_start_page.html new file mode 100644 index 0000000..8962cdf --- /dev/null +++ b/core/res/res/raw-fr/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nouvelle fenêtre de navigation privée</title> + </head> + <body> + <p><strong>Vous êtes passé en navigation privée</strong>. Les pages que vous consultez dans cette fenêtre n'apparaîtront ni dans l'historique de votre navigateur, ni dans l'historique des recherches, et ne laisseront aucune trace (comme les cookies) sur votre appareil une fois que vous aurez fermé la fenêtre de navigation privée. Tous les fichiers téléchargés et les favoris créés seront toutefois conservés.</p> + + <p><strong>Passer en navigation privée n'a aucun effet sur les autres utilisateurs, serveurs ou logiciels. Méfiez-vous :</strong></p> + + <ul> + <li>Des sites Web qui collectent ou partagent des informations vous concernant</li> + <li>Des fournisseurs d'accès Internet ou des employeurs qui conservent une trace des pages que vous visitez</li> + <li>Des programmes indésirables qui enregistrent vos frappes en échange d'émoticônes gratuites</li> + <li>Des personnes qui pourraient surveiller vos activités</li> + <li>Des personnes qui se tiennent derrière vous</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-hi-xlarge/incognito_mode_start_page.html b/core/res/res/raw-hi-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..f73c41d --- /dev/null +++ b/core/res/res/raw-hi-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>नई गुप्त विंडो</title> + </head> + <body> + <p><strong>आप गुप्त मोड में हैं</strong>. इस विंडो में देखे गए पृष्ठ आपके ब्राउज़र इतिहास या खोज इतिहास में प्रकट नहीं होंगे, और वे आपके डिवाइस पर गुप्त विंडो बंद करने के बाद और कोई चिह्न जैसे कुकीज़, नहीं छोड़ते. हालांकि डाउनलोड की गई या बुकमार्क की गई कोई भी फ़ाइल संरक्षित रखी जाएगी.</p> + + <p><strong>गुप्त मोड में होने से दूसरे लोगों, सर्वर. या सॉफ़्टवेयर पर कोई प्रभाव नहीं होता. इनका ध्यान रखें</strong></p> + + <ul> + <li>वे वेबसाइट जो आपके बारे में जानकारी एकत्र या शेयर करती हैं</li> + <li>इंटरनेट सेवा प्रदाता या नियोक्ता जो आपके द्वारा विज़िट किए गए पृष्ठों पर नज़र रखते हैं</li> + <li>दुर्भावनापूर्ण सॉफ़्टवेयर जो मुफ़्त स्माइली के बदले आपके कीस्ट्रोक पर नज़र रखते हैं.</li> + <li>गुप्तचरों द्वारा निगरानी</li> + <li>आपके पीछे खड़े लोग</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-hi/incognito_mode_start_page.html b/core/res/res/raw-hi/incognito_mode_start_page.html new file mode 100644 index 0000000..f73c41d --- /dev/null +++ b/core/res/res/raw-hi/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>नई गुप्त विंडो</title> + </head> + <body> + <p><strong>आप गुप्त मोड में हैं</strong>. इस विंडो में देखे गए पृष्ठ आपके ब्राउज़र इतिहास या खोज इतिहास में प्रकट नहीं होंगे, और वे आपके डिवाइस पर गुप्त विंडो बंद करने के बाद और कोई चिह्न जैसे कुकीज़, नहीं छोड़ते. हालांकि डाउनलोड की गई या बुकमार्क की गई कोई भी फ़ाइल संरक्षित रखी जाएगी.</p> + + <p><strong>गुप्त मोड में होने से दूसरे लोगों, सर्वर. या सॉफ़्टवेयर पर कोई प्रभाव नहीं होता. इनका ध्यान रखें</strong></p> + + <ul> + <li>वे वेबसाइट जो आपके बारे में जानकारी एकत्र या शेयर करती हैं</li> + <li>इंटरनेट सेवा प्रदाता या नियोक्ता जो आपके द्वारा विज़िट किए गए पृष्ठों पर नज़र रखते हैं</li> + <li>दुर्भावनापूर्ण सॉफ़्टवेयर जो मुफ़्त स्माइली के बदले आपके कीस्ट्रोक पर नज़र रखते हैं.</li> + <li>गुप्तचरों द्वारा निगरानी</li> + <li>आपके पीछे खड़े लोग</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-hr-xlarge/incognito_mode_start_page.html b/core/res/res/raw-hr-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..6f20fe0 --- /dev/null +++ b/core/res/res/raw-hr-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Novi anonimni prozor</title> + </head> + <body> + <p><strong>Sada ste anonimni</strong>. Stranice koje pregledavate u ovom prozoru neće se pojaviti u povijesti preglednika ili povijesti pretraživanja, neće ostaviti tragove, poput kolačića, na vašem uređaju nakon što zatvorite anonimni prozor. Međutim, sve datoteke koje preuzmete ili oznake koje stvorite bit će sačuvane.</p> + + <p><strong>Anonimno pregledavanje neće utjecati na ponašanje drugih osoba, poslužitelja ili softvera. Pazite na sljedeće:</strong></p> + + <ul> + <li>Web-lokacije koje prikupljaju ili dijele informacije o vama</li> + <li>Davatelje internetskih usluga ili poslodavce koji prate stranice koje posjećujete</li> + <li>Zlonamjerni softver koji prati koje tipke pritišćete u zamjenu za besplatne emotikone</li> + <li>Nadzor tajnih službi</li> + <li>Osobe koje stoje iza vas</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-hr/incognito_mode_start_page.html b/core/res/res/raw-hr/incognito_mode_start_page.html new file mode 100644 index 0000000..6f20fe0 --- /dev/null +++ b/core/res/res/raw-hr/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Novi anonimni prozor</title> + </head> + <body> + <p><strong>Sada ste anonimni</strong>. Stranice koje pregledavate u ovom prozoru neće se pojaviti u povijesti preglednika ili povijesti pretraživanja, neće ostaviti tragove, poput kolačića, na vašem uređaju nakon što zatvorite anonimni prozor. Međutim, sve datoteke koje preuzmete ili oznake koje stvorite bit će sačuvane.</p> + + <p><strong>Anonimno pregledavanje neće utjecati na ponašanje drugih osoba, poslužitelja ili softvera. Pazite na sljedeće:</strong></p> + + <ul> + <li>Web-lokacije koje prikupljaju ili dijele informacije o vama</li> + <li>Davatelje internetskih usluga ili poslodavce koji prate stranice koje posjećujete</li> + <li>Zlonamjerni softver koji prati koje tipke pritišćete u zamjenu za besplatne emotikone</li> + <li>Nadzor tajnih službi</li> + <li>Osobe koje stoje iza vas</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-hu-xlarge/incognito_mode_start_page.html b/core/res/res/raw-hu-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..38b0806 --- /dev/null +++ b/core/res/res/raw-hu-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Új inkognitóablak</title> + </head> + <body> + <p><strong>Ön inkognitó módra váltott</strong>. Az inkognitóablakban megtekintett oldalak nem jelennek meg böngészője előzményeiben, illetve keresési előzményeiben, és nem hagynak más nyomot pl. cookie-t sem a számítógépén az inkognitóablak bezárását követően. A letöltött fájlok, valamint a létrehozott könyvjelzők azonban megmaradnak.</p> + + <p><strong>Az inkognitó üzemmód nem befolyásolja a többi felhasználó, szerver vagy szoftver viselkedését. Ügyeljen a következőkre:</strong></p> + + <ul> + <li>Olyan webhelyek, amelyek információt gyűjtenek vagy osztanak meg Önről</li> + <li>Olyan internetszolgáltatók vagy alkalmazottaik, akik nyomon követik az Ön által látogatott oldalakat</li> + <li>Olyan kártékony szoftverek, amelyek ingyenes hangulatjelekért cserébe nyomon követik billentyűbeviteleit</li> + <li>Titkos ügynökök megfigyelése</li> + <li>Az Ön mögött álló emberek</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-hu/incognito_mode_start_page.html b/core/res/res/raw-hu/incognito_mode_start_page.html new file mode 100644 index 0000000..38b0806 --- /dev/null +++ b/core/res/res/raw-hu/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Új inkognitóablak</title> + </head> + <body> + <p><strong>Ön inkognitó módra váltott</strong>. Az inkognitóablakban megtekintett oldalak nem jelennek meg böngészője előzményeiben, illetve keresési előzményeiben, és nem hagynak más nyomot pl. cookie-t sem a számítógépén az inkognitóablak bezárását követően. A letöltött fájlok, valamint a létrehozott könyvjelzők azonban megmaradnak.</p> + + <p><strong>Az inkognitó üzemmód nem befolyásolja a többi felhasználó, szerver vagy szoftver viselkedését. Ügyeljen a következőkre:</strong></p> + + <ul> + <li>Olyan webhelyek, amelyek információt gyűjtenek vagy osztanak meg Önről</li> + <li>Olyan internetszolgáltatók vagy alkalmazottaik, akik nyomon követik az Ön által látogatott oldalakat</li> + <li>Olyan kártékony szoftverek, amelyek ingyenes hangulatjelekért cserébe nyomon követik billentyűbeviteleit</li> + <li>Titkos ügynökök megfigyelése</li> + <li>Az Ön mögött álló emberek</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-id-xlarge/incognito_mode_start_page.html b/core/res/res/raw-id-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..788c088 --- /dev/null +++ b/core/res/res/raw-id-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Jendela penyamaran baru</title> + </head> + <body> + <p><strong>Anda menggunakan penyamaran</strong>. Laman yang Anda lihat di jendela ini tidak akan ditampilkan dalam riwayat peramban atau riwayat penelusuran, dan tidak akan meninggalkan jejak, seperti kuki, di perangkat setelah jendela penyamaran ditutup. Namun, berkas yang diunduh atau bookmark yang dibuat akan disimpan.</p> + + <p><strong>Menggunakan penyamaran tidak mempengaruhi perilaku orang lain, server, atau perangkat lunak. Waspadai:</strong></p> + + <ul> + <li>Situs web yang mengumpulkan atau berbagi informasi tentang Anda</li> + <li>Penyedia layanan internet atau tempat kerja yang melacak laman yang Anda kunjungi</li> + <li>Perangkat lunak jahat yang melacak penekanan tombol dengan imbalan smiley gratis</li> + <li>Pemantauan oleh agen rahasia</li> + <li>Orang yang berdiri di belakang Anda</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-id/incognito_mode_start_page.html b/core/res/res/raw-id/incognito_mode_start_page.html new file mode 100644 index 0000000..788c088 --- /dev/null +++ b/core/res/res/raw-id/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Jendela penyamaran baru</title> + </head> + <body> + <p><strong>Anda menggunakan penyamaran</strong>. Laman yang Anda lihat di jendela ini tidak akan ditampilkan dalam riwayat peramban atau riwayat penelusuran, dan tidak akan meninggalkan jejak, seperti kuki, di perangkat setelah jendela penyamaran ditutup. Namun, berkas yang diunduh atau bookmark yang dibuat akan disimpan.</p> + + <p><strong>Menggunakan penyamaran tidak mempengaruhi perilaku orang lain, server, atau perangkat lunak. Waspadai:</strong></p> + + <ul> + <li>Situs web yang mengumpulkan atau berbagi informasi tentang Anda</li> + <li>Penyedia layanan internet atau tempat kerja yang melacak laman yang Anda kunjungi</li> + <li>Perangkat lunak jahat yang melacak penekanan tombol dengan imbalan smiley gratis</li> + <li>Pemantauan oleh agen rahasia</li> + <li>Orang yang berdiri di belakang Anda</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-it-xlarge/incognito_mode_start_page.html b/core/res/res/raw-it-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..4a34874 --- /dev/null +++ b/core/res/res/raw-it-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nuova finestra di navigazione in incognito</title> + </head> + <body> + <p><strong>Sei passato alla navigazione in incognito</strong>. Le pagine aperte in questa finestra non vengono registrate nella cronologia di navigazione o di ricerca, e non lasciano traccia sul tuo computer, ad esempio sotto forma di cookie, una volta chiusa la finestra. Tuttavia, qualsiasi file scaricato o preferito creato verrà conservato.</p> + + <p><strong>La navigazione in incognito non influisce sul comportamento di altri utenti, server o software. Diffida di:</strong></p> + + <ul> + <li>Siti web che raccolgono o condividono informazioni su di te</li> + <li>Provider di servizi Internet o datori di lavoro che registrano le pagine da te visitate</li> + <li>Software dannosi che registrano le sequenze di tasti da te utilizzate in cambio di smiley gratuiti</li> + <li>Agenti segreti</li> + <li>Persone che ti stanno alle spalle</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-it/incognito_mode_start_page.html b/core/res/res/raw-it/incognito_mode_start_page.html new file mode 100644 index 0000000..4a34874 --- /dev/null +++ b/core/res/res/raw-it/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nuova finestra di navigazione in incognito</title> + </head> + <body> + <p><strong>Sei passato alla navigazione in incognito</strong>. Le pagine aperte in questa finestra non vengono registrate nella cronologia di navigazione o di ricerca, e non lasciano traccia sul tuo computer, ad esempio sotto forma di cookie, una volta chiusa la finestra. Tuttavia, qualsiasi file scaricato o preferito creato verrà conservato.</p> + + <p><strong>La navigazione in incognito non influisce sul comportamento di altri utenti, server o software. Diffida di:</strong></p> + + <ul> + <li>Siti web che raccolgono o condividono informazioni su di te</li> + <li>Provider di servizi Internet o datori di lavoro che registrano le pagine da te visitate</li> + <li>Software dannosi che registrano le sequenze di tasti da te utilizzate in cambio di smiley gratuiti</li> + <li>Agenti segreti</li> + <li>Persone che ti stanno alle spalle</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-iw-xlarge/incognito_mode_start_page.html b/core/res/res/raw-iw-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..368dea0 --- /dev/null +++ b/core/res/res/raw-iw-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="RTL"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>חלון חדש של גלישה בסתר</title> + </head> + <body> + <p><strong>עברת למצב של גלישה בסתר</strong>. דפים שאתה רואה בחלון זה לא יופיעו בהיסטוריית הדפדפן או בהיסטוריית החיפושים שלך, והם לא ישאירו עקבות אחרים, כמו קובצי cookie, לאחר שתסגור את חלון הגלישה בסתר. עם זאת, כל קובץ שאתה מוריד או כוכביות שאתה יוצר יישמרו.</p> + + <p><strong> גלישה בסתר לא משפיעה על התנהגותם של אנשים אחרים, שרתים אחרים או תוכנות אחרות. היזהר מ:</strong></p> + + <ul> + <li>אתרים שאוספים נתונים או משתפים מידע לגביך</li> + <li>ספקי שירות אינטרנט או עובדים שעוקבים אחר הדפים שבהם אתה מבקר</li> + <li>תוכנה זדונית שעוקבת אחר ההקשות שלך על המקשים בתמורה לסימני סמיילי בחינם</li> + <li>מעקב של סוכנים חשאיים</li> + <li>אנשים שעומדים מאחוריך</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-iw/incognito_mode_start_page.html b/core/res/res/raw-iw/incognito_mode_start_page.html new file mode 100644 index 0000000..368dea0 --- /dev/null +++ b/core/res/res/raw-iw/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="RTL"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>חלון חדש של גלישה בסתר</title> + </head> + <body> + <p><strong>עברת למצב של גלישה בסתר</strong>. דפים שאתה רואה בחלון זה לא יופיעו בהיסטוריית הדפדפן או בהיסטוריית החיפושים שלך, והם לא ישאירו עקבות אחרים, כמו קובצי cookie, לאחר שתסגור את חלון הגלישה בסתר. עם זאת, כל קובץ שאתה מוריד או כוכביות שאתה יוצר יישמרו.</p> + + <p><strong> גלישה בסתר לא משפיעה על התנהגותם של אנשים אחרים, שרתים אחרים או תוכנות אחרות. היזהר מ:</strong></p> + + <ul> + <li>אתרים שאוספים נתונים או משתפים מידע לגביך</li> + <li>ספקי שירות אינטרנט או עובדים שעוקבים אחר הדפים שבהם אתה מבקר</li> + <li>תוכנה זדונית שעוקבת אחר ההקשות שלך על המקשים בתמורה לסימני סמיילי בחינם</li> + <li>מעקב של סוכנים חשאיים</li> + <li>אנשים שעומדים מאחוריך</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-ja-xlarge/incognito_mode_start_page.html b/core/res/res/raw-ja-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..a58ad05 --- /dev/null +++ b/core/res/res/raw-ja-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>新しいシークレットウィンドウ</title> + </head> + <body> + <p><strong>シークレットモードを使用中です</strong>。このウィンドウで開いたページはブラウザの履歴や検索履歴に残りません。このウィンドウを閉じるとCookieなどの記録も端末から消去されます。ただし、ダウンロードしたファイルやブックマークしたページは保存されます。</p> + + <p><strong>シークレットモードが他のユーザーやサーバー、ソフトウェアの動作に影響することはありません。なお、下記のようなケースにご注意ください。</strong></p> + + <ul> + <li>ユーザーの情報を収集、共有するウェブサイト</li> + <li>アクセスしたページをトラッキングするインターネットサービスプロバイダや雇用主</li> + <li>無料ダウンロードなどと一緒にインストールされ、キーストロークを記録するマルウェア</li> + <li>スパイ、諜報活動</li> + <li>背後にいる人</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-ja/incognito_mode_start_page.html b/core/res/res/raw-ja/incognito_mode_start_page.html new file mode 100644 index 0000000..a58ad05 --- /dev/null +++ b/core/res/res/raw-ja/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>新しいシークレットウィンドウ</title> + </head> + <body> + <p><strong>シークレットモードを使用中です</strong>。このウィンドウで開いたページはブラウザの履歴や検索履歴に残りません。このウィンドウを閉じるとCookieなどの記録も端末から消去されます。ただし、ダウンロードしたファイルやブックマークしたページは保存されます。</p> + + <p><strong>シークレットモードが他のユーザーやサーバー、ソフトウェアの動作に影響することはありません。なお、下記のようなケースにご注意ください。</strong></p> + + <ul> + <li>ユーザーの情報を収集、共有するウェブサイト</li> + <li>アクセスしたページをトラッキングするインターネットサービスプロバイダや雇用主</li> + <li>無料ダウンロードなどと一緒にインストールされ、キーストロークを記録するマルウェア</li> + <li>スパイ、諜報活動</li> + <li>背後にいる人</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-ko-xlarge/incognito_mode_start_page.html b/core/res/res/raw-ko-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..0e703b1 --- /dev/null +++ b/core/res/res/raw-ko-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>새 시크릿 창</title> + </head> + <body> + <p><strong>시크릿 모드로 들어오셨습니다.</strong> 이 창에서 보는 페이지는 브라우저 기록이나 검색기록에 남지 않으며, 시크릿 창을 닫은 뒤 기기에 쿠기와 같은 흔적도 남기지 않습니다. 다운로드한 파일이나 생성한 북마크는 보관됩니다. </p> + + <p><strong>시크릿 모드를 이용해도 다른 사용자, 서버, 소프트웨어에 영향을 주지는 않습니다. 다음을 주의하세요.</strong></p> + + <ul> + <li>사용자에 대한 정보를 모으고 공유하는 웹사이트</li> + <li>방문 페이지를 추적하는 인터넷 서비스 제공업체나 직원 </li> + <li>스마일 이모티콘을 제공한다는 명목으로 입력 내용을 추적하는 악성 소프트웨어</li> + <li>비밀 개체를 통한 감시</li> + <li>뒤에서 사용자의 작업내용을 지켜보는 사람</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-ko/incognito_mode_start_page.html b/core/res/res/raw-ko/incognito_mode_start_page.html new file mode 100644 index 0000000..0e703b1 --- /dev/null +++ b/core/res/res/raw-ko/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>새 시크릿 창</title> + </head> + <body> + <p><strong>시크릿 모드로 들어오셨습니다.</strong> 이 창에서 보는 페이지는 브라우저 기록이나 검색기록에 남지 않으며, 시크릿 창을 닫은 뒤 기기에 쿠기와 같은 흔적도 남기지 않습니다. 다운로드한 파일이나 생성한 북마크는 보관됩니다. </p> + + <p><strong>시크릿 모드를 이용해도 다른 사용자, 서버, 소프트웨어에 영향을 주지는 않습니다. 다음을 주의하세요.</strong></p> + + <ul> + <li>사용자에 대한 정보를 모으고 공유하는 웹사이트</li> + <li>방문 페이지를 추적하는 인터넷 서비스 제공업체나 직원 </li> + <li>스마일 이모티콘을 제공한다는 명목으로 입력 내용을 추적하는 악성 소프트웨어</li> + <li>비밀 개체를 통한 감시</li> + <li>뒤에서 사용자의 작업내용을 지켜보는 사람</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-lt-xlarge/incognito_mode_start_page.html b/core/res/res/raw-lt-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..9244ae4 --- /dev/null +++ b/core/res/res/raw-lt-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Naujas inkognito langas</title> + </head> + <body> + <p><strong>Naršote inkognito režimu</strong>. Šiame lange peržiūrimi puslapiai nebus išsaugomi naršyklės istorijoje ar paieškos istorijoje ir uždarius inkognito langą nepaliks jokių kitų žymių, pvz., slapukų. Tačiau bus išsaugoti atsisiųsti failai ar sukurtos žymos.</p> + + <p><strong>Naršymas inkognito režimu nedaro jokios įtakos kitiems asmenims, serveriams ar programinei įrangai. Saugokitės:</strong></p> + + <ul> + <li>svetainių, kurios renka ar platina informaciją apie jus</li> + <li>interneto paslaugos teikėjų ar darbdavių, kurie stebi, kuriuos puslapius peržiūrite</li> + <li>kenkėjiškos programinės įrangos, kuri siūlydama nemokamų šypsniukų fiksuoja klavišų paspaudimus</li> + <li>jus galinčių sekti slaptųjų agentų</li> + <li>už nugaros stovinčių asmenų</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-lt/incognito_mode_start_page.html b/core/res/res/raw-lt/incognito_mode_start_page.html new file mode 100644 index 0000000..9244ae4 --- /dev/null +++ b/core/res/res/raw-lt/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Naujas inkognito langas</title> + </head> + <body> + <p><strong>Naršote inkognito režimu</strong>. Šiame lange peržiūrimi puslapiai nebus išsaugomi naršyklės istorijoje ar paieškos istorijoje ir uždarius inkognito langą nepaliks jokių kitų žymių, pvz., slapukų. Tačiau bus išsaugoti atsisiųsti failai ar sukurtos žymos.</p> + + <p><strong>Naršymas inkognito režimu nedaro jokios įtakos kitiems asmenims, serveriams ar programinei įrangai. Saugokitės:</strong></p> + + <ul> + <li>svetainių, kurios renka ar platina informaciją apie jus</li> + <li>interneto paslaugos teikėjų ar darbdavių, kurie stebi, kuriuos puslapius peržiūrite</li> + <li>kenkėjiškos programinės įrangos, kuri siūlydama nemokamų šypsniukų fiksuoja klavišų paspaudimus</li> + <li>jus galinčių sekti slaptųjų agentų</li> + <li>už nugaros stovinčių asmenų</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-lv-xlarge/incognito_mode_start_page.html b/core/res/res/raw-lv-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..f325ef5 --- /dev/null +++ b/core/res/res/raw-lv-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Jauns inkognito logs</title> + </head> + <body> + <p><strong>Jūs esat ieslēdzis inkognito režīmu</strong>. Šajā logā aplūkotās lapas neparādīsies jūsu pārlūkprogrammas vēsturē vai meklēšanas vēsturē, tās arī neatstās citas pēdas, piemēram, sīkfailus, jūsu ierīcē pēc inkognito režīma loga aizvēršanas. Tomēr visi jūsu lejupielādētie faili vai izveidotās grāmatzīmes tiks saglabātas.</p> + + <p><strong>Inkognito režīma ieslēgšana neietekmēs citu personu, serveru vai programmatūras darbību. Uzmanieties no</strong></p> + + <ul> + <li>vietnēm, kas apkopo vai koplieto informāciju par jums;</li> + <li>interneta pakalpojumu sniedzējiem vai darba devējiem, kas izseko jūsu apmeklētajām lapām;</li> + <li>maldprogrammatūras, kas izseko jūsu taustiņsitieniem apmaiņā par bezmaksas smaidiņiem;</li> + <li>slepeno aģentu veiktas izmeklēšanas;</li> + <li>personām, kas stāv aiz jums.</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-lv/incognito_mode_start_page.html b/core/res/res/raw-lv/incognito_mode_start_page.html new file mode 100644 index 0000000..f325ef5 --- /dev/null +++ b/core/res/res/raw-lv/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Jauns inkognito logs</title> + </head> + <body> + <p><strong>Jūs esat ieslēdzis inkognito režīmu</strong>. Šajā logā aplūkotās lapas neparādīsies jūsu pārlūkprogrammas vēsturē vai meklēšanas vēsturē, tās arī neatstās citas pēdas, piemēram, sīkfailus, jūsu ierīcē pēc inkognito režīma loga aizvēršanas. Tomēr visi jūsu lejupielādētie faili vai izveidotās grāmatzīmes tiks saglabātas.</p> + + <p><strong>Inkognito režīma ieslēgšana neietekmēs citu personu, serveru vai programmatūras darbību. Uzmanieties no</strong></p> + + <ul> + <li>vietnēm, kas apkopo vai koplieto informāciju par jums;</li> + <li>interneta pakalpojumu sniedzējiem vai darba devējiem, kas izseko jūsu apmeklētajām lapām;</li> + <li>maldprogrammatūras, kas izseko jūsu taustiņsitieniem apmaiņā par bezmaksas smaidiņiem;</li> + <li>slepeno aģentu veiktas izmeklēšanas;</li> + <li>personām, kas stāv aiz jums.</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-nb-xlarge/incognito_mode_start_page.html b/core/res/res/raw-nb-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..724e734 --- /dev/null +++ b/core/res/res/raw-nb-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nytt inkognitovindu</title> + </head> + <body> + <p><strong></strong>Du er nå inkognito Sider du besøker i dette vinduet blir ikke lagret i nettleser- eller søkelogg, og etterlater ikke andre spor, f. eks. informasjonskapsler, på enheten din etter at du har lukket vinduet. Filer du laster ned eller bokmerker du lager blir derimot lagret.</p> + + <p><strong>Det at du er inkognito endrer ikke hvordan andre mennesker, tjenere eller programmer oppfører seg. Pass deg for:</strong></p> + + <ul> + <li>Nettsider som samler eller deler informasjon om deg</li> + <li>Nettleverandører eller arbeidsgivere som overvåker hvilke sider du besøker</li> + <li>Skadelige programmer som følger med på tastetrykk i bytte mot smilefjes</li> + <li>Hemmelige agenter som spionerer på deg</li> + <li>Folk som titter over skulderen din</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-nb/incognito_mode_start_page.html b/core/res/res/raw-nb/incognito_mode_start_page.html new file mode 100644 index 0000000..724e734 --- /dev/null +++ b/core/res/res/raw-nb/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nytt inkognitovindu</title> + </head> + <body> + <p><strong></strong>Du er nå inkognito Sider du besøker i dette vinduet blir ikke lagret i nettleser- eller søkelogg, og etterlater ikke andre spor, f. eks. informasjonskapsler, på enheten din etter at du har lukket vinduet. Filer du laster ned eller bokmerker du lager blir derimot lagret.</p> + + <p><strong>Det at du er inkognito endrer ikke hvordan andre mennesker, tjenere eller programmer oppfører seg. Pass deg for:</strong></p> + + <ul> + <li>Nettsider som samler eller deler informasjon om deg</li> + <li>Nettleverandører eller arbeidsgivere som overvåker hvilke sider du besøker</li> + <li>Skadelige programmer som følger med på tastetrykk i bytte mot smilefjes</li> + <li>Hemmelige agenter som spionerer på deg</li> + <li>Folk som titter over skulderen din</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-nl-xlarge/incognito_mode_start_page.html b/core/res/res/raw-nl-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..92fedd7 --- /dev/null +++ b/core/res/res/raw-nl-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nieuw incognitovenster</title> + </head> + <body> + <p><strong>U bent nu incognito</strong> De pagina's die u in dit venster bekijkt worden niet opgenomen in de browsergeschiedenis en de zoekgeschiedenis en laten geen cookies of andere sporen na op uw apparaat nadat u het incognitovenster hebt gesloten. Alle bestanden die u downloadt en bladwijzers die u maakt, blijven echter behouden.</p> + + <p><strong>Incognito zijn heeft geen invloed op het gedrag van andere personen, servers of software. Wees op uw hoede voor:</strong></p> + + <ul> + <li>Websites die informatie over u verzamelen of delen</li> + <li>Internetproviders of werkgevers die bijhouden welke pagina's u bezoekt</li> + <li>Schadelijke software die uw toetsaanslagen registreert in ruil voor gratis emoticons</li> + <li>Spionage door geheim agenten</li> + <li>Mensen die achter u staan</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-nl/incognito_mode_start_page.html b/core/res/res/raw-nl/incognito_mode_start_page.html new file mode 100644 index 0000000..92fedd7 --- /dev/null +++ b/core/res/res/raw-nl/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nieuw incognitovenster</title> + </head> + <body> + <p><strong>U bent nu incognito</strong> De pagina's die u in dit venster bekijkt worden niet opgenomen in de browsergeschiedenis en de zoekgeschiedenis en laten geen cookies of andere sporen na op uw apparaat nadat u het incognitovenster hebt gesloten. Alle bestanden die u downloadt en bladwijzers die u maakt, blijven echter behouden.</p> + + <p><strong>Incognito zijn heeft geen invloed op het gedrag van andere personen, servers of software. Wees op uw hoede voor:</strong></p> + + <ul> + <li>Websites die informatie over u verzamelen of delen</li> + <li>Internetproviders of werkgevers die bijhouden welke pagina's u bezoekt</li> + <li>Schadelijke software die uw toetsaanslagen registreert in ruil voor gratis emoticons</li> + <li>Spionage door geheim agenten</li> + <li>Mensen die achter u staan</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-pl-xlarge/incognito_mode_start_page.html b/core/res/res/raw-pl-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..9748ead --- /dev/null +++ b/core/res/res/raw-pl-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nowe okno incognito</title> + </head> + <body> + <p><strong>Jesteś teraz incognito</strong> Strony przeglądane w tym oknie nie będą wyświetlane w historii przeglądarki ani w historii wyszukiwania. Po zamknięciu okna incognito na komputerze nie zostanie po nich żaden ślad np. w postaci plików cookie. Zachowane zostaną jednak pobrane pliki lub utworzone zakładki.</p> + + <p><strong>Przejście do trybu incognito nie ma wpływu na działania innych osób, serwery ani oprogramowanie. Należy uważać na:</strong></p> + + <ul> + <li>witryny zbierające lub udostępniające dane na temat użytkowników</li> + <li>dostawców usług internetowych oraz pracowników monitorujących strony odwiedzane przez użytkowników</li> + <li>złośliwe oprogramowanie śledzące naciśnięcia klawiszy (np. w zamian za darmowe emotikony)</li> + <li>aktywność wywiadowczą tajnych agentów</li> + <li>osoby stojące za plecami</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-pl/incognito_mode_start_page.html b/core/res/res/raw-pl/incognito_mode_start_page.html new file mode 100644 index 0000000..9748ead --- /dev/null +++ b/core/res/res/raw-pl/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nowe okno incognito</title> + </head> + <body> + <p><strong>Jesteś teraz incognito</strong> Strony przeglądane w tym oknie nie będą wyświetlane w historii przeglądarki ani w historii wyszukiwania. Po zamknięciu okna incognito na komputerze nie zostanie po nich żaden ślad np. w postaci plików cookie. Zachowane zostaną jednak pobrane pliki lub utworzone zakładki.</p> + + <p><strong>Przejście do trybu incognito nie ma wpływu na działania innych osób, serwery ani oprogramowanie. Należy uważać na:</strong></p> + + <ul> + <li>witryny zbierające lub udostępniające dane na temat użytkowników</li> + <li>dostawców usług internetowych oraz pracowników monitorujących strony odwiedzane przez użytkowników</li> + <li>złośliwe oprogramowanie śledzące naciśnięcia klawiszy (np. w zamian za darmowe emotikony)</li> + <li>aktywność wywiadowczą tajnych agentów</li> + <li>osoby stojące za plecami</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-pt-rPT-xlarge/incognito_mode_start_page.html b/core/res/res/raw-pt-rPT-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..89a5ab0 --- /dev/null +++ b/core/res/res/raw-pt-rPT-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nova janela de navegação anónima</title> + </head> + <body> + <p><strong>Está no modo de navegação anónima</strong>. As páginas que visualizar nesta janela não vão aparecer nos históricos de pesquisa ou de navegação e não deixarão quaisquer vestígios (por exemplo cookies) no computador depois de fechar a janela. No entanto se transferir ficheiros ou criar marcadores, estes serão preservados.</p> + + <p><strong>Navegar no modo de navegação anónima não afecta o comportamento de outras pessoas, nem o comportamento de servidores ou programas. Tenha cuidado com:</strong></p> + + <ul> + <li>Web sites que recolhem ou partilham informações sobre si</li> + <li>Serviços de fornecimento de internet ou empregadores que monitorizam as páginas que você visita</li> + <li>Programas maliciosos que monitorizam as teclas em que carrega em troca de ícones expressivos ("smileys")</li> + <li>Vigilância de agentes secretos</li> + <li>Pessoas que estejam perto de si</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-pt-rPT/incognito_mode_start_page.html b/core/res/res/raw-pt-rPT/incognito_mode_start_page.html new file mode 100644 index 0000000..89a5ab0 --- /dev/null +++ b/core/res/res/raw-pt-rPT/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nova janela de navegação anónima</title> + </head> + <body> + <p><strong>Está no modo de navegação anónima</strong>. As páginas que visualizar nesta janela não vão aparecer nos históricos de pesquisa ou de navegação e não deixarão quaisquer vestígios (por exemplo cookies) no computador depois de fechar a janela. No entanto se transferir ficheiros ou criar marcadores, estes serão preservados.</p> + + <p><strong>Navegar no modo de navegação anónima não afecta o comportamento de outras pessoas, nem o comportamento de servidores ou programas. Tenha cuidado com:</strong></p> + + <ul> + <li>Web sites que recolhem ou partilham informações sobre si</li> + <li>Serviços de fornecimento de internet ou empregadores que monitorizam as páginas que você visita</li> + <li>Programas maliciosos que monitorizam as teclas em que carrega em troca de ícones expressivos ("smileys")</li> + <li>Vigilância de agentes secretos</li> + <li>Pessoas que estejam perto de si</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-pt-xlarge/incognito_mode_start_page.html b/core/res/res/raw-pt-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..b301eda --- /dev/null +++ b/core/res/res/raw-pt-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nova janela anônima</title> + </head> + <body> + <p><strong>Você ficou anônimo</strong>. As páginas que você vê nesta janela não aparecerão no histórico do seu navegador ou da sua pesquisa e não deixarão rastros, como cookies, no seu dispositivo depois que você fechar a janela anônima. Quaisquer arquivos que você fizer o download ou favoritos que criar serão preservados.</p> + + <p><strong>Tornar-se anônimo não afeta o comportamento de outras pessoas, servidores ou software. Esteja atento a:</strong></p> + + <ul> + <li>Websites que coletam ou compartilham informações sobre você</li> + <li>Provedores de serviços de internet ou funcionários que rastreiam as páginas que você visita</li> + <li>Softwares maliciosos que rastreiam os seus toques de teclado em troca de ícones gratuitos</li> + <li>Vigilância por agentes secretos</li> + <li>Pessoas paradas detrás de você</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-pt/incognito_mode_start_page.html b/core/res/res/raw-pt/incognito_mode_start_page.html new file mode 100644 index 0000000..b301eda --- /dev/null +++ b/core/res/res/raw-pt/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nova janela anônima</title> + </head> + <body> + <p><strong>Você ficou anônimo</strong>. As páginas que você vê nesta janela não aparecerão no histórico do seu navegador ou da sua pesquisa e não deixarão rastros, como cookies, no seu dispositivo depois que você fechar a janela anônima. Quaisquer arquivos que você fizer o download ou favoritos que criar serão preservados.</p> + + <p><strong>Tornar-se anônimo não afeta o comportamento de outras pessoas, servidores ou software. Esteja atento a:</strong></p> + + <ul> + <li>Websites que coletam ou compartilham informações sobre você</li> + <li>Provedores de serviços de internet ou funcionários que rastreiam as páginas que você visita</li> + <li>Softwares maliciosos que rastreiam os seus toques de teclado em troca de ícones gratuitos</li> + <li>Vigilância por agentes secretos</li> + <li>Pessoas paradas detrás de você</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-ro-xlarge/incognito_mode_start_page.html b/core/res/res/raw-ro-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..3e499d3 --- /dev/null +++ b/core/res/res/raw-ro-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Fereastră incognito nouă</title> + </head> + <body> + <p><strong>Navigaţi incognito</strong>. Paginile pe care le afişaţi în această fereastră nu vor apărea în istoricul browserului sau al căutărilor şi nu vor lăsa alte urme, precum cookie-uri, pe dispozitivul dvs. după ce închideţi fereastra incognito. Dar fişierele descărcate şi marcajele create vor fi păstrate.</p> + + <p><strong>Navigarea incognito nu influenţează comportamentul altor persoane, servere sau aplicaţii software. Fiţi atent(ă) la:</strong></p> + + <ul> + <li>site-urile web care colectează sau distribuie informaţii despre dvs.;</li> + <li>furnizorii de servicii de internet sau angajatorii care urmăresc paginile pe care le accesaţi;</li> + <li>aplicaţiile software rău intenţionate care vă urmăresc apăsările pe taste promiţându-vă că vă oferă emoticonuri gratuite;</li> + <li>acţiunile de monitorizare efectuate de agenţi secreţi;</li> + <li>persoanele din spatele dvs.</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-ro/incognito_mode_start_page.html b/core/res/res/raw-ro/incognito_mode_start_page.html new file mode 100644 index 0000000..3e499d3 --- /dev/null +++ b/core/res/res/raw-ro/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Fereastră incognito nouă</title> + </head> + <body> + <p><strong>Navigaţi incognito</strong>. Paginile pe care le afişaţi în această fereastră nu vor apărea în istoricul browserului sau al căutărilor şi nu vor lăsa alte urme, precum cookie-uri, pe dispozitivul dvs. după ce închideţi fereastra incognito. Dar fişierele descărcate şi marcajele create vor fi păstrate.</p> + + <p><strong>Navigarea incognito nu influenţează comportamentul altor persoane, servere sau aplicaţii software. Fiţi atent(ă) la:</strong></p> + + <ul> + <li>site-urile web care colectează sau distribuie informaţii despre dvs.;</li> + <li>furnizorii de servicii de internet sau angajatorii care urmăresc paginile pe care le accesaţi;</li> + <li>aplicaţiile software rău intenţionate care vă urmăresc apăsările pe taste promiţându-vă că vă oferă emoticonuri gratuite;</li> + <li>acţiunile de monitorizare efectuate de agenţi secreţi;</li> + <li>persoanele din spatele dvs.</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-ru-xlarge/incognito_mode_start_page.html b/core/res/res/raw-ru-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..ae7b59c --- /dev/null +++ b/core/res/res/raw-ru-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Новое окно в режиме инкогнито</title> + </head> + <body> + <p><strong>Вы перешли в режим инкогнито</strong>. Страницы, которые вы просматриваете в окне в режиме инкогнито, не появятся в истории вашего браузера или истории поиска, а также не оставят на вашем компьютере других следов, таких как файлы cookie, когда вы закроете это окно. Тем не менее, все файлы, которые вы загружаете, или закладки, которые вы создаете, останутся в целости и сохранности. </p> + + <p><strong>Переход в режим инкогнито не влияет на поведение других пользователей, серверов или программ. Опасайтесь:</strong></p> + + <ul> + <li>Веб-сайтов, которые собирают информацию о вас или передают ее другим</li> + <li>Поставщиков услуг Интернета или их сотрудников, которые отслеживают, какие страницы вы посещаете</li> + <li>Вредоносного ПО, которое отслеживает нажатие клавиш клавиатуры в обмен на бесплатные смайлики</li> + <li>Слежки тайными агентами</li> + <li>Людей, которые стоят у вас за спиной</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-ru/incognito_mode_start_page.html b/core/res/res/raw-ru/incognito_mode_start_page.html new file mode 100644 index 0000000..ae7b59c --- /dev/null +++ b/core/res/res/raw-ru/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Новое окно в режиме инкогнито</title> + </head> + <body> + <p><strong>Вы перешли в режим инкогнито</strong>. Страницы, которые вы просматриваете в окне в режиме инкогнито, не появятся в истории вашего браузера или истории поиска, а также не оставят на вашем компьютере других следов, таких как файлы cookie, когда вы закроете это окно. Тем не менее, все файлы, которые вы загружаете, или закладки, которые вы создаете, останутся в целости и сохранности. </p> + + <p><strong>Переход в режим инкогнито не влияет на поведение других пользователей, серверов или программ. Опасайтесь:</strong></p> + + <ul> + <li>Веб-сайтов, которые собирают информацию о вас или передают ее другим</li> + <li>Поставщиков услуг Интернета или их сотрудников, которые отслеживают, какие страницы вы посещаете</li> + <li>Вредоносного ПО, которое отслеживает нажатие клавиш клавиатуры в обмен на бесплатные смайлики</li> + <li>Слежки тайными агентами</li> + <li>Людей, которые стоят у вас за спиной</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-sk-xlarge/incognito_mode_start_page.html b/core/res/res/raw-sk-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..5b138f1 --- /dev/null +++ b/core/res/res/raw-sk-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nové okno inkognito</title> + </head> + <body> + <p><strong>Ste v režime inkognito</strong> Stránky, ktoré si pozriete v tomto okne, sa nezobrazia v histórii prehliadača ani v histórii vyhľadávania. Po zavretí okna inkognito na zariadení nezostanú ani žiadne iné stopy, ako sú napr. súbory cookie. Napriek tomu však zostanú zachované všetky prevzaté súbory aj záložky, ktoré ste vytvorili.</p> + + <p><strong>Režim inkognito neovplyvňuje správanie iných ľudí, serverov ani softvéru. Dávajte si pozor na:</strong></p> + + <ul> + <li>webové stránky, ktoré zbierajú alebo zdieľajú vaše informácie;</li> + <li>poskytovateľov internetových služieb alebo zamestnancov, ktorí sledujú vaše navštívené stránky;</li> + <li>škodlivý softvér, ktorý sleduje ktoré klávesy stláčate výmenou za smajlíkov zadarmo;</li> + <li>sledovanie tajnými agentmi;</li> + <li>ľudí, ktorí stoja za vami.</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-sk/incognito_mode_start_page.html b/core/res/res/raw-sk/incognito_mode_start_page.html new file mode 100644 index 0000000..5b138f1 --- /dev/null +++ b/core/res/res/raw-sk/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nové okno inkognito</title> + </head> + <body> + <p><strong>Ste v režime inkognito</strong> Stránky, ktoré si pozriete v tomto okne, sa nezobrazia v histórii prehliadača ani v histórii vyhľadávania. Po zavretí okna inkognito na zariadení nezostanú ani žiadne iné stopy, ako sú napr. súbory cookie. Napriek tomu však zostanú zachované všetky prevzaté súbory aj záložky, ktoré ste vytvorili.</p> + + <p><strong>Režim inkognito neovplyvňuje správanie iných ľudí, serverov ani softvéru. Dávajte si pozor na:</strong></p> + + <ul> + <li>webové stránky, ktoré zbierajú alebo zdieľajú vaše informácie;</li> + <li>poskytovateľov internetových služieb alebo zamestnancov, ktorí sledujú vaše navštívené stránky;</li> + <li>škodlivý softvér, ktorý sleduje ktoré klávesy stláčate výmenou za smajlíkov zadarmo;</li> + <li>sledovanie tajnými agentmi;</li> + <li>ľudí, ktorí stoja za vami.</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-sl-xlarge/incognito_mode_start_page.html b/core/res/res/raw-sl-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..33a8b08 --- /dev/null +++ b/core/res/res/raw-sl-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Novo okno brez beleženja zgodovine</title> + </head> + <body> + <p><strong>Ste v načinu brez beleženja zgodovine.</strong> Strani, ki si jih ogledate v tem oknu, ne bodo prikazane v zgodovini brskalnika ali zgodovini iskanja, prav tako v vaši napravi ne bodo pustile sledi, kot npr. piškotkov, ko zaprete stran, ki jo imate odprto v tem načinu. Datoteke, ki jih prenesete ali zaznamki, ki jih ustvarite, bodo ohranjeni.</p> + + <p><strong>Funkcije brez beleženja zgodovine ne vplivajo na obnašanje drugih oseb, strežnikov ali programske opreme. Pazite na:</strong></p> + + <ul> + <li>Spletna mesta, ki zbirajo informacije o vas ali jih dajejo v skupno rabo.</li> + <li>Ponudnike internetnih storitev ali zaposlene, ki spremljajo spletna mesta, ki ste jih obiskali.</li> + <li>Zlonamerno programsko opremo, ki spremlja vaše tipkanje, v zameno pa vam ponuja brezplačne čustvene simbole.</li> + <li>Nadzor tajnih agentov.</li> + <li>Osebe, ki stojijo za vašim hrbtom.</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-sl/incognito_mode_start_page.html b/core/res/res/raw-sl/incognito_mode_start_page.html new file mode 100644 index 0000000..33a8b08 --- /dev/null +++ b/core/res/res/raw-sl/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Novo okno brez beleženja zgodovine</title> + </head> + <body> + <p><strong>Ste v načinu brez beleženja zgodovine.</strong> Strani, ki si jih ogledate v tem oknu, ne bodo prikazane v zgodovini brskalnika ali zgodovini iskanja, prav tako v vaši napravi ne bodo pustile sledi, kot npr. piškotkov, ko zaprete stran, ki jo imate odprto v tem načinu. Datoteke, ki jih prenesete ali zaznamki, ki jih ustvarite, bodo ohranjeni.</p> + + <p><strong>Funkcije brez beleženja zgodovine ne vplivajo na obnašanje drugih oseb, strežnikov ali programske opreme. Pazite na:</strong></p> + + <ul> + <li>Spletna mesta, ki zbirajo informacije o vas ali jih dajejo v skupno rabo.</li> + <li>Ponudnike internetnih storitev ali zaposlene, ki spremljajo spletna mesta, ki ste jih obiskali.</li> + <li>Zlonamerno programsko opremo, ki spremlja vaše tipkanje, v zameno pa vam ponuja brezplačne čustvene simbole.</li> + <li>Nadzor tajnih agentov.</li> + <li>Osebe, ki stojijo za vašim hrbtom.</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-sr-xlarge/incognito_mode_start_page.html b/core/res/res/raw-sr-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..b1fbcb1 --- /dev/null +++ b/core/res/res/raw-sr-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Нов прозор без архивирања</title> + </head> + <body> + <p><strong>Ушли сте у режим без архивирања</strong> Странице које гледате у овом прозору се неће појавити у историји прегледања ни историји претраге, нити ће оставити друге трагове, попут колачића, на вашем уређају када затворите овај прозор. Међутим, ако преузмете датотеке или направите обележиваче, они ће бити сачувани.</p> + + <p><strong>Режим без архивирања не утиче на понашање других људи, сервера нити софтвера. Чувајте се:</strong></p> + + <ul> + <li>Веб сајтова који прикупљају и деле податке о вама</li> + <li>Добављача интернет услуга или запослених који прате странице које посетите</li> + <li>Злонамерног софтвера који прати шта куцате</li> + <li>Надзора тајних агената</li> + <li>Људи који вам стоје иза леђа</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-sr/incognito_mode_start_page.html b/core/res/res/raw-sr/incognito_mode_start_page.html new file mode 100644 index 0000000..b1fbcb1 --- /dev/null +++ b/core/res/res/raw-sr/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Нов прозор без архивирања</title> + </head> + <body> + <p><strong>Ушли сте у режим без архивирања</strong> Странице које гледате у овом прозору се неће појавити у историји прегледања ни историји претраге, нити ће оставити друге трагове, попут колачића, на вашем уређају када затворите овај прозор. Међутим, ако преузмете датотеке или направите обележиваче, они ће бити сачувани.</p> + + <p><strong>Режим без архивирања не утиче на понашање других људи, сервера нити софтвера. Чувајте се:</strong></p> + + <ul> + <li>Веб сајтова који прикупљају и деле податке о вама</li> + <li>Добављача интернет услуга или запослених који прате странице које посетите</li> + <li>Злонамерног софтвера који прати шта куцате</li> + <li>Надзора тајних агената</li> + <li>Људи који вам стоје иза леђа</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-sv-xlarge/incognito_mode_start_page.html b/core/res/res/raw-sv-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..5ebbb22 --- /dev/null +++ b/core/res/res/raw-sv-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nytt inkognitofönster</title> + </head> + <body> + <p><strong>Du använder inkognitoläget</strong>. Sidor som du har läst i detta fönster visas inte i din webbläsarhistorik eller sökhistorik. De lämnar inga spår efter sig, till exempel cookies, i din enhet efter att du stängt inkognitofönstret. Alla filer som du hämtar eller bokmärken du skapar sparas dock.</p> + + <p><strong>Att använda datorn inkognito påverkar inte användare, servrar eller program. Se upp för:</strong></p> + + <ul> + <li>Webbplatser som samlar eller delar information om dig</li> + <li>Internetleverantörer eller arbetsgivare som spårar var du surfar</li> + <li>Skadlig programvara som spårar dina tangenttryckningar som nyckelloggare</li> + <li>Övervakning av hemliga agenter</li> + <li>Personer som står bakom dig</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-sv/incognito_mode_start_page.html b/core/res/res/raw-sv/incognito_mode_start_page.html new file mode 100644 index 0000000..5ebbb22 --- /dev/null +++ b/core/res/res/raw-sv/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Nytt inkognitofönster</title> + </head> + <body> + <p><strong>Du använder inkognitoläget</strong>. Sidor som du har läst i detta fönster visas inte i din webbläsarhistorik eller sökhistorik. De lämnar inga spår efter sig, till exempel cookies, i din enhet efter att du stängt inkognitofönstret. Alla filer som du hämtar eller bokmärken du skapar sparas dock.</p> + + <p><strong>Att använda datorn inkognito påverkar inte användare, servrar eller program. Se upp för:</strong></p> + + <ul> + <li>Webbplatser som samlar eller delar information om dig</li> + <li>Internetleverantörer eller arbetsgivare som spårar var du surfar</li> + <li>Skadlig programvara som spårar dina tangenttryckningar som nyckelloggare</li> + <li>Övervakning av hemliga agenter</li> + <li>Personer som står bakom dig</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-th-xlarge/incognito_mode_start_page.html b/core/res/res/raw-th-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..29c64eb --- /dev/null +++ b/core/res/res/raw-th-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>หน้าต่างใหม่ที่ไม่ระบุตัวตน</title> + </head> + <body> + <p><strong>คุณได้เข้าสู่โหมดไม่ระบุตัวตนแล้ว</strong> หน้าเว็บที่คุณดูในหน้าต่างนี้จะไม่ปรากฏในประวัติของเบราว์เซอร์หรือประวัติการค้นหาของคุณ และจะไม่ทิ้งร่องรอยอื่นๆ เช่น คุกกี้ ไว้บนอุปกรณ์หลังจากที่คุณปิดหน้าต่างที่ไม่ระบุตัวตนนี้แล้ว อย่างไรก็ตาม ไฟล์ที่คุณดาวน์โหลดหรือบุ๊กมาร์กที่สร้างขึ้นจะถูกเก็บไว้</p> + + <p><strong>การเข้าสู่โหมดไม่ระบุตัวตนจะไม่กระทบต่อการทำงานของบุคคล เซิร์ฟเวอร์ หรือซอฟต์แวร์อื่น โปรดระวัง:</strong></p> + + <ul> + <li>เว็บไซต์ที่เก็บหรือแบ่งปันข้อมูลเกี่ยวกับคุณ</li> + <li>ผู้ให้บริการอินเทอร์เน็ตหรือนายจ้างที่ติดตามหน้าเว็บที่คุณเข้าชม</li> + <li>ซอฟต์แวร์มุ่งร้ายที่ติดตามการกดแป้นพิมพ์โดยมากับของฟรี</li> + <li>การตรวจสอบของหน่วยสืบราชการลับ</li> + <li>บุคคลที่ยืนอยู่ข้างหลังคุณ</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-th/incognito_mode_start_page.html b/core/res/res/raw-th/incognito_mode_start_page.html new file mode 100644 index 0000000..29c64eb --- /dev/null +++ b/core/res/res/raw-th/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>หน้าต่างใหม่ที่ไม่ระบุตัวตน</title> + </head> + <body> + <p><strong>คุณได้เข้าสู่โหมดไม่ระบุตัวตนแล้ว</strong> หน้าเว็บที่คุณดูในหน้าต่างนี้จะไม่ปรากฏในประวัติของเบราว์เซอร์หรือประวัติการค้นหาของคุณ และจะไม่ทิ้งร่องรอยอื่นๆ เช่น คุกกี้ ไว้บนอุปกรณ์หลังจากที่คุณปิดหน้าต่างที่ไม่ระบุตัวตนนี้แล้ว อย่างไรก็ตาม ไฟล์ที่คุณดาวน์โหลดหรือบุ๊กมาร์กที่สร้างขึ้นจะถูกเก็บไว้</p> + + <p><strong>การเข้าสู่โหมดไม่ระบุตัวตนจะไม่กระทบต่อการทำงานของบุคคล เซิร์ฟเวอร์ หรือซอฟต์แวร์อื่น โปรดระวัง:</strong></p> + + <ul> + <li>เว็บไซต์ที่เก็บหรือแบ่งปันข้อมูลเกี่ยวกับคุณ</li> + <li>ผู้ให้บริการอินเทอร์เน็ตหรือนายจ้างที่ติดตามหน้าเว็บที่คุณเข้าชม</li> + <li>ซอฟต์แวร์มุ่งร้ายที่ติดตามการกดแป้นพิมพ์โดยมากับของฟรี</li> + <li>การตรวจสอบของหน่วยสืบราชการลับ</li> + <li>บุคคลที่ยืนอยู่ข้างหลังคุณ</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-tl-xlarge/incognito_mode_start_page.html b/core/res/res/raw-tl-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..6ce5853 --- /dev/null +++ b/core/res/res/raw-tl-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Bagong incognito window</title> + </head> + <body> + <p><strong>Nag-incognito ka</strong>. Hindi lalabas sa iyong kasaysayan ng pag-browse at kasaysayan ng paghahanap ang mga pahinang tiningnan mo sa window na ito, at hindi sila mag-iiwan ng ibang bakas, gaya ng cookies, sa iyong device matapos mong isara ang window na incognito. Gayunpaman, pananatiliin ang anumang mga file na iyong na-download o ang iyong mga ginawang bookmark.</p> + + <p><strong>Hindi nakakaapekto ang pagiging incognito sa gawi ng ibang mga tao, server, o software. Maging maingat sa:</strong></p> + + <ul> + <li>Mga website na kumokolekta o nagbabahagi ng impormasyong tungkol sa iyo</li> + <li>Mga internet service provider o mga employer na sinusubaybayan ang mga pahinang binibisita mo</li> + <li>Malicious software na sinusubaybayan ang iyong mga keystroke kapalit ng mga libreng smiley</li> + <li>Pagmamasid ng mga secret agent</li> + <li>Mga tao na nakatayo sa likuran mo</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-tl/incognito_mode_start_page.html b/core/res/res/raw-tl/incognito_mode_start_page.html new file mode 100644 index 0000000..6ce5853 --- /dev/null +++ b/core/res/res/raw-tl/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Bagong incognito window</title> + </head> + <body> + <p><strong>Nag-incognito ka</strong>. Hindi lalabas sa iyong kasaysayan ng pag-browse at kasaysayan ng paghahanap ang mga pahinang tiningnan mo sa window na ito, at hindi sila mag-iiwan ng ibang bakas, gaya ng cookies, sa iyong device matapos mong isara ang window na incognito. Gayunpaman, pananatiliin ang anumang mga file na iyong na-download o ang iyong mga ginawang bookmark.</p> + + <p><strong>Hindi nakakaapekto ang pagiging incognito sa gawi ng ibang mga tao, server, o software. Maging maingat sa:</strong></p> + + <ul> + <li>Mga website na kumokolekta o nagbabahagi ng impormasyong tungkol sa iyo</li> + <li>Mga internet service provider o mga employer na sinusubaybayan ang mga pahinang binibisita mo</li> + <li>Malicious software na sinusubaybayan ang iyong mga keystroke kapalit ng mga libreng smiley</li> + <li>Pagmamasid ng mga secret agent</li> + <li>Mga tao na nakatayo sa likuran mo</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-tr-xlarge/incognito_mode_start_page.html b/core/res/res/raw-tr-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..c570cc7 --- /dev/null +++ b/core/res/res/raw-tr-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Yeni gizli pencere</title> + </head> + <body> + <p><strong>Gizli moda geçtiniz</strong> Bu pencerede görüntülediğiniz sayfalar tarayıcı geçmişinizde veya arama geçmişinizde görünmez ve gizli pencereyi kapatmanızın ardından cihazınızda çerezler gibi izler bırakmaz. Ancak, indirdiğiniz dosyalar ve oluşturduğunuz favoriler korunur.</p> + + <p><strong>Gizli moda geçmeniz diğer kişilerin, sunucuların veya yazılımların davranışlarını etkilemez. Şu konularda dikkatli olun:</strong></p> + + <ul> + <li>Hakkınızda bilgi toplayan veya paylaşan web siteleri</li> + <li>Ziyaret ettiğiniz sayfaları izleyen şirket çalışanları veya servis sağlayıcıları</li> + <li>Ücretsiz ifade simgeleri karşılığında tuş vuruşlarınızı takip eden kötü niyetli yazılımlar</li> + <li>Gizli ajanlar tarafından takip edilme</li> + <li>Arkanızda dikilip ne yaptığınıza bakan kişiler</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-tr/incognito_mode_start_page.html b/core/res/res/raw-tr/incognito_mode_start_page.html new file mode 100644 index 0000000..c570cc7 --- /dev/null +++ b/core/res/res/raw-tr/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Yeni gizli pencere</title> + </head> + <body> + <p><strong>Gizli moda geçtiniz</strong> Bu pencerede görüntülediğiniz sayfalar tarayıcı geçmişinizde veya arama geçmişinizde görünmez ve gizli pencereyi kapatmanızın ardından cihazınızda çerezler gibi izler bırakmaz. Ancak, indirdiğiniz dosyalar ve oluşturduğunuz favoriler korunur.</p> + + <p><strong>Gizli moda geçmeniz diğer kişilerin, sunucuların veya yazılımların davranışlarını etkilemez. Şu konularda dikkatli olun:</strong></p> + + <ul> + <li>Hakkınızda bilgi toplayan veya paylaşan web siteleri</li> + <li>Ziyaret ettiğiniz sayfaları izleyen şirket çalışanları veya servis sağlayıcıları</li> + <li>Ücretsiz ifade simgeleri karşılığında tuş vuruşlarınızı takip eden kötü niyetli yazılımlar</li> + <li>Gizli ajanlar tarafından takip edilme</li> + <li>Arkanızda dikilip ne yaptığınıza bakan kişiler</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-uk-xlarge/incognito_mode_start_page.html b/core/res/res/raw-uk-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..8852854 --- /dev/null +++ b/core/res/res/raw-uk-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Нове анонімне вікно</title> + </head> + <body> + <p><strong>Ви в анонімному режимі</strong>. Сторінки, які ви переглядаєте в цьому вікні, не з’являться в історії веб-переглядача чи в історії пошуку. Вони також не залишать жодних слідів, як-от файлів cookie, у вашому пристрої після того, як ви закриєте анонімне вікно. Однак, завантажені файли та збережені закладки залишаться.</p> + + <p><strong>Анонімний режим не впливає на поведінку інших людей, серверів чи програмного забезпечення. Остерігайтеся:</strong></p> + + <ul> + <li>веб-сайтів, які збирають чи поширюють інформацію про вас</li> + <li>постачальників інтернет-послуг або роботодавців, які відстежують сторінки, які ви відвідуєте</li> + <li>зловмисного програмного забезпечення, яке пропонує безкоштовні смайли, натомість реєструючи клавіші, які ви натискаєте</li> + <li>нагляду збоку секретних служб</li> + <li>людей за вашою спиною</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-uk/incognito_mode_start_page.html b/core/res/res/raw-uk/incognito_mode_start_page.html new file mode 100644 index 0000000..8852854 --- /dev/null +++ b/core/res/res/raw-uk/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Нове анонімне вікно</title> + </head> + <body> + <p><strong>Ви в анонімному режимі</strong>. Сторінки, які ви переглядаєте в цьому вікні, не з’являться в історії веб-переглядача чи в історії пошуку. Вони також не залишать жодних слідів, як-от файлів cookie, у вашому пристрої після того, як ви закриєте анонімне вікно. Однак, завантажені файли та збережені закладки залишаться.</p> + + <p><strong>Анонімний режим не впливає на поведінку інших людей, серверів чи програмного забезпечення. Остерігайтеся:</strong></p> + + <ul> + <li>веб-сайтів, які збирають чи поширюють інформацію про вас</li> + <li>постачальників інтернет-послуг або роботодавців, які відстежують сторінки, які ви відвідуєте</li> + <li>зловмисного програмного забезпечення, яке пропонує безкоштовні смайли, натомість реєструючи клавіші, які ви натискаєте</li> + <li>нагляду збоку секретних служб</li> + <li>людей за вашою спиною</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-vi-xlarge/incognito_mode_start_page.html b/core/res/res/raw-vi-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..9902cde --- /dev/null +++ b/core/res/res/raw-vi-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Cửa sổ ẩn danh mới</title> + </head> + <body> + <p><strong>Bạn đã sử dụng cửa sổ ẩn danh</strong>. Các trang bạn xem trong cửa sổ này sẽ không xuất hiện trong lịch sử của trình duyệt hoặc lịch sử tìm kiếm và chúng cũng không để lại dấu vết như cookie trên thiết bị sau khi bạn đóng cửa sổ ẩn danh. Tuy nhiên, mọi tệp bạn tải xuống hoặc mọi dấu trang bạn tạo sẽ được giữ nguyên.</p> + + <p><strong>Sử dụng cửa sổ ẩn danh không ảnh hưởng đến hành vi của người khác, của máy chủ hoặc phần mềm. Hãy cảnh giác với:</strong></p> + + <ul> + <li>Các trang web thu thập hoặc chia sẻ thông tin về bạn</li> + <li>Nhà cung cấp dịch vụ Internet hoặc ông chủ muốn theo dõi những trang bạn đã truy cập</li> + <li>Phần mềm độc hại theo dõi thao tác gõ phím khi nhập các mặt cười</li> + <li>Sự theo dõi của các cơ quan tình báo</li> + <li>Những người đứng đằng sau bạn</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-vi/incognito_mode_start_page.html b/core/res/res/raw-vi/incognito_mode_start_page.html new file mode 100644 index 0000000..9902cde --- /dev/null +++ b/core/res/res/raw-vi/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>Cửa sổ ẩn danh mới</title> + </head> + <body> + <p><strong>Bạn đã sử dụng cửa sổ ẩn danh</strong>. Các trang bạn xem trong cửa sổ này sẽ không xuất hiện trong lịch sử của trình duyệt hoặc lịch sử tìm kiếm và chúng cũng không để lại dấu vết như cookie trên thiết bị sau khi bạn đóng cửa sổ ẩn danh. Tuy nhiên, mọi tệp bạn tải xuống hoặc mọi dấu trang bạn tạo sẽ được giữ nguyên.</p> + + <p><strong>Sử dụng cửa sổ ẩn danh không ảnh hưởng đến hành vi của người khác, của máy chủ hoặc phần mềm. Hãy cảnh giác với:</strong></p> + + <ul> + <li>Các trang web thu thập hoặc chia sẻ thông tin về bạn</li> + <li>Nhà cung cấp dịch vụ Internet hoặc ông chủ muốn theo dõi những trang bạn đã truy cập</li> + <li>Phần mềm độc hại theo dõi thao tác gõ phím khi nhập các mặt cười</li> + <li>Sự theo dõi của các cơ quan tình báo</li> + <li>Những người đứng đằng sau bạn</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-zh-rCN-xlarge/incognito_mode_start_page.html b/core/res/res/raw-zh-rCN-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..2caf8f8 --- /dev/null +++ b/core/res/res/raw-zh-rCN-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>新建隐身窗口</title> + </head> + <body> + <p><strong>您已进入隐身模式</strong>。当关闭隐身窗口后，您在此窗口中查看的网页将不会出现在您的浏览器历史记录或搜索记录中，也不会在您的设备留下任何踪迹（如 cookie）。但是，您下载的任何文件或您创建的书签会予以保留。</p> + + <p><strong>进入隐身模式不会影响他人、其他服务器或软件的行为。敬请提防：</strong></p> + + <ul> + <li>搜集并分享有关您的信息的网站</li> + <li>跟踪您所访问的网页的互联网服务提供商或雇主</li> + <li>跟踪您的键盘输入内容以换取免费表情符号的恶意软件</li> + <li>对您进行监视的秘密代理</li> + <li>站在您身后的人</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-zh-rCN/incognito_mode_start_page.html b/core/res/res/raw-zh-rCN/incognito_mode_start_page.html new file mode 100644 index 0000000..2caf8f8 --- /dev/null +++ b/core/res/res/raw-zh-rCN/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>新建隐身窗口</title> + </head> + <body> + <p><strong>您已进入隐身模式</strong>。当关闭隐身窗口后，您在此窗口中查看的网页将不会出现在您的浏览器历史记录或搜索记录中，也不会在您的设备留下任何踪迹（如 cookie）。但是，您下载的任何文件或您创建的书签会予以保留。</p> + + <p><strong>进入隐身模式不会影响他人、其他服务器或软件的行为。敬请提防：</strong></p> + + <ul> + <li>搜集并分享有关您的信息的网站</li> + <li>跟踪您所访问的网页的互联网服务提供商或雇主</li> + <li>跟踪您的键盘输入内容以换取免费表情符号的恶意软件</li> + <li>对您进行监视的秘密代理</li> + <li>站在您身后的人</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-zh-rTW-xlarge/incognito_mode_start_page.html b/core/res/res/raw-zh-rTW-xlarge/incognito_mode_start_page.html new file mode 100644 index 0000000..54eb40b --- /dev/null +++ b/core/res/res/raw-zh-rTW-xlarge/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>新的無痕式視窗</title> + </head> + <body> + <p><strong>您已開啟無痕式視窗</strong>。透過這個視窗開啟的網頁都不會出現在瀏覽器記錄和搜尋記錄中，而且您關閉此類視窗之後，裝置上並不會保留任何相關記錄 (例如 cookie)。不過系統會保存您的下載檔案和書籤。</p> + + <p><strong>無痕式視窗無法掌控人、伺服器和軟體的行為，所以請小心下列的人事物：</strong></p> + + <ul> + <li>會收集或分享您的相關資訊的網站</li> + <li>會追蹤您造訪網頁的網路服務供應商或雇主</li> + <li>以免費下載為誘因引誘您點擊的連結，其中通常隱藏鍵盤記錄惡意軟體</li> + <li>情報特務的監控</li> + <li>站在您身後的人</li> + </ul> + </body> +</html> diff --git a/core/res/res/raw-zh-rTW/incognito_mode_start_page.html b/core/res/res/raw-zh-rTW/incognito_mode_start_page.html new file mode 100644 index 0000000..54eb40b --- /dev/null +++ b/core/res/res/raw-zh-rTW/incognito_mode_start_page.html @@ -0,0 +1,19 @@ +<html DIR="LTR"> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" /> + <title>新的無痕式視窗</title> + </head> + <body> + <p><strong>您已開啟無痕式視窗</strong>。透過這個視窗開啟的網頁都不會出現在瀏覽器記錄和搜尋記錄中，而且您關閉此類視窗之後，裝置上並不會保留任何相關記錄 (例如 cookie)。不過系統會保存您的下載檔案和書籤。</p> + + <p><strong>無痕式視窗無法掌控人、伺服器和軟體的行為，所以請小心下列的人事物：</strong></p> + + <ul> + <li>會收集或分享您的相關資訊的網站</li> + <li>會追蹤您造訪網頁的網路服務供應商或雇主</li> + <li>以免費下載為誘因引誘您點擊的連結，其中通常隱藏鍵盤記錄惡意軟體</li> + <li>情報特務的監控</li> + <li>站在您身後的人</li> + </ul> + </body> +</html> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 6d1f1aa..e9261d9 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"للسماح للتطبيق بالتحكم في الهزاز."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"التحكم في الضوء الوامض"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"للسماح للتطبيق بالتحكم في الضوء الوامض."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"الدخول إلى أجهزة USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"للسماح للتطبيق بالدخول إلى أجهزة USB."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"تنفيذ بروتوكول MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"لإتاحة الدخول إلى برنامج تشغيل kernel MTP لتنفيذ بروتوكول MTP USB."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"اختبار الأجهزة"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"محو بيانات الهاتف بدون تحذير، وذلك عبر إجراء إعادة الضبط بحسب بيانات المصنع"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"تعيين الخادم الوكيل العمومي للجهاز"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"تعيين الخادم الوكيل العمومي للجهاز لكي يتم استخدامه أثناء تمكين السياسة. يعين مشرف الجهاز الأول فقط الخادم الوكيل العمومي الفعال."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"تعيين انتهاء صلاحية كلمة المرور"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"التحكم في الوقت المستغرق قبل الحاجة إلى تغيير كلمة مرور شاشة التوقف"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"ضبط انتهاء كلمة مرور تأمين شاشة"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"التحكم في عدد مرات تغيير كلمة مرور تأمين الشاشة"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"تعيين تشفير التخزين"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"طلب تشفير بيانات التطبيق المخزنة"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"الاستخدام بشكل افتراضي لهذا الإجراء."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"محو الإعداد الافتراضي في الإعدادات الرئيسية > التطبيقات > إدارة التطبيقات."</string> <string name="chooseActivity" msgid="1009246475582238425">"تحديد إجراء"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"ليس هناك تطبيقات يمكنها تنفيذ هذا الإجراء."</string> <string name="aerr_title" msgid="653922989522758100">"عذرًا!"</string> <string name="aerr_application" msgid="4683614104336409186">"توقف التطبيق <xliff:g id="APPLICATION">%1$s</xliff:g> (العملية <xliff:g id="PROCESS">%2$s</xliff:g>) على نحو غير متوقع. الرجاء المحاولة مرة أخرى."</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index ca36b5c..d15baa9 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Разрешава на приложението да контролира устройството за вибрация."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"контролиране на фенерчето"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Разрешава на приложението да контролира фенерчето."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"достъп до USB устройства"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Разрешава на приложението достъп до USB устройства."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"внедряване на MTP протокол"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Разрешава достъп до MTP драйвера на ядрото за внедряване на протокола MTP през USB."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"тест на хардуера"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Изтриване на данните в телефона без предупреждение чрез възстановяване на фабричните настройки"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Задаване на глобален прокси сървър за устройството"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Задаване на глобалния прокси сървър, който да се използва, когато правилото е активирано. Само първият администратор на устройството задава действителния глобален прокси сървър."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Задаване на срок на валидност на паролата"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Контролирайте след колко време трябва да се променя паролата за заключване на екрана"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Изтичане на паролата"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Контролирайте колко често трябва да се променя паролата за заключен екран"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Шифроване за хранилището"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Изисква съхраняваните данни за приложенията да бъдат шифровани"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Използване по подразбиране за това действие."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Изчистване на стандартната стойност в „Начални настройки“ > „Приложения“ > „Управление на приложенията“."</string> <string name="chooseActivity" msgid="1009246475582238425">"Избиране на действие"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Това действие не може да се изпълни от нито едно приложение."</string> <string name="aerr_title" msgid="653922989522758100">"Съжаляваме!"</string> <string name="aerr_application" msgid="4683614104336409186">"Приложението „<xliff:g id="APPLICATION">%1$s</xliff:g>“ (процес „<xliff:g id="PROCESS">%2$s</xliff:g>“) спря неочаквано. Моля, опитайте отново."</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index d506c67..263f1c4 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Permet a l\'aplicació controlar el vibrador."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"controlar el flaix"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Permet a l\'aplicació controlar el flaix."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"accedeix a dispositius USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Permet que l\'aplicació accedeixi als dispositius USB."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"implementa el protocol MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Permet l\'accés al programa de control MTP de kernel per implementar el protocol USB d\'MTP."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"provar el maquinari"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Esborra les dades del telèfon sense advertiment mitjançant un restabliment de les dades de fàbrica"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Defineix el servidor intermediari global del dispositiu"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Defineix el servidor intermediari global del dispositiu que cal utilitzar mentre la política estigui activada. Només el primer administrador del dispositiu pot definir el servidor intermediari global efectiu."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Defineix la caducitat de la contrasenya"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Controla quant de temps abans de la pantalla de bloqueig cal canviar la contrasenya"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Defineix la caducitat de la contrasenya de bloqueig de pantalla"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Controla la freqüència amb què cal canviar la contrasenya de bloqueig de pantalla"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Encriptació d’emmagatzematge"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Requereix que les dades de l\'aplicació emmagatzemades estiguin encriptades"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Utilitza-ho de manera predeterminada per a aquesta acció."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Esborra el valor predeterminat a Configuració de la pantalla d\'inici > Aplicacions > Gestiona les aplicacions."</string> <string name="chooseActivity" msgid="1009246475582238425">"Seleccioneu una acció"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"No hi ha cap aplicació que pugui dur a terme aquesta acció."</string> <string name="aerr_title" msgid="653922989522758100">"Ho sentim."</string> <string name="aerr_application" msgid="4683614104336409186">"L\'aplicació <xliff:g id="APPLICATION">%1$s</xliff:g> (procés <xliff:g id="PROCESS">%2$s</xliff:g>) s\'ha aturat inesperadament. Torneu-ho a provar."</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index afc8a2e..b93989f 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Umožňuje aplikaci ovládat vibrace."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"ovládání kontrolky"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Umožňuje aplikaci ovládat kontrolku."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"přístup k zařízením USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Umožní aplikaci přístup k zařízením USB."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"implementace protokolu MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Povoluje přístup k ovladači protokolu MTP jádra za účelem implementace protokolu MTP USB."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"testování hardwaru"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Bez upozornění smazat všechna data telefonu obnovením továrních dat"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Nastavit globální proxy server zařízení"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Vyberte globální proxy server, který se bude používat, když jsou zásady aktivní. Aktuální globální proxy server nastavuje pouze první správce zařízení."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Nastavit konec platnosti hesla"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Ovládání doby, po jejímž uplynutí je nutné změnit heslo pro odemknutí obrazovky"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Nastavit vypršení hesla zámku"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Určuje, jak často je třeba měnit heslo pro uzamčení obrazovky"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Nastavit šifrování úložiště"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Požadovat šifrování ukládaných dat"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Použít jako výchozí nastavení pro tuto činnost."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Vymažte výchozí hodnoty v Nastavení plochy > Aplikace > Správa aplikací."</string> <string name="chooseActivity" msgid="1009246475582238425">"Vyberte akci"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Tuto činnost nemohou provádět žádné aplikace."</string> <string name="aerr_title" msgid="653922989522758100">"Omlouváme se"</string> <string name="aerr_application" msgid="4683614104336409186">"Aplikace <xliff:g id="APPLICATION">%1$s</xliff:g> (proces <xliff:g id="PROCESS">%2$s</xliff:g>) byla neočekávaně ukončena. Zkuste to znovu."</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 3e283fc..25246f6 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Lader programmet kontrollere vibratoren."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"kontroller lommelygte"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Tillader, at programmet kontrollerer lommelygten."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"adgang til USB-enheder."</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Tillader, at programmet har adgang til USB-enheder."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"implementere MTP-protokol"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Tillader adgang til kerne-MTP-driveren for at implementere MTB USB-protokollen."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"test hardware"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Slet telefonens data uden varsel ved at gendanne fabriksindstillinger"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Angiv enhedens globale proxy"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Angiv enhedens globale proxy, der skal bruges, mens politikken er aktiveret. Kun den første enhedsadministrator angiver den effektive globale proxy."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Angiv udløb for adgangskode"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Kontroller, hvor lang tid der skal gå, før adgangskoden til skærmlåsen skal ændres."</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Angiv udløb for skærmlåskoden"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Administrer, hvor tit skærmlåsens adgangskode skal skiftes"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Angiv kryptering af lager"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Kræv, at gemte programdata krypteres"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Brug som standard til denne handling."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Ryd standard i Startindstillinger > Programmer > Administrer programmer."</string> <string name="chooseActivity" msgid="1009246475582238425">"Vælg en handling"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Der er ingen programmer, der kan foretage denne handling."</string> <string name="aerr_title" msgid="653922989522758100">"Beklager!"</string> <string name="aerr_application" msgid="4683614104336409186">"Programmet <xliff:g id="APPLICATION">%1$s</xliff:g> (proces <xliff:g id="PROCESS">%2$s</xliff:g>) er standset uventet. Prøv igen."</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index ccee3d0..98e0ef3 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -49,7 +49,7 @@ <string name="needPuk" msgid="919668385956251611">"Ihre SIM-Karte ist mit einem PUK gesperrt. Geben Sie zum Entsperren den PUK-Code ein."</string> <string name="needPuk2" msgid="4526033371987193070">"Geben Sie zum Entsperren der SIM-Karte den PUK2 ein."</string> <string name="ClipMmi" msgid="6952821216480289285">"Anrufer-ID für eingehenden Anruf"</string> - <string name="ClirMmi" msgid="7784673673446833091">"Anrufer-ID für abgehenden Anruf"</string> + <string name="ClirMmi" msgid="7784673673446833091">"Anrufer-ID für ausgehenden Anruf"</string> <string name="CfMmi" msgid="5123218989141573515">"Rufweiterleitung"</string> <string name="CwMmi" msgid="9129678056795016867">"Anklopfen"</string> <string name="BaMmi" msgid="455193067926770581">"Anrufsperre"</string> @@ -153,18 +153,18 @@ <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Flugmodus ist AUS."</string> <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100 +"</string> <string name="safeMode" msgid="2788228061547930246">"Abgesicherter Modus"</string> - <string name="android_system_label" msgid="6577375335728551336">"Android System"</string> + <string name="android_system_label" msgid="6577375335728551336">"Android-System"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Kostenpflichtige Dienste"</string> - <string name="permgroupdesc_costMoney" msgid="8193824940620517189">"Ermöglicht Anwendungen die Ausführung eventuell kostenpflichtiger Aktionen."</string> + <string name="permgroupdesc_costMoney" msgid="8193824940620517189">"Ermöglicht Anwendungen die Ausführung eventuell kostenpflichtiger Aktionen"</string> <string name="permgrouplab_messages" msgid="7521249148445456662">"Ihre Nachrichten"</string> <string name="permgroupdesc_messages" msgid="7045736972019211994">"Lesen und schreiben Sie Ihre SMS, E-Mails und anderen Nachrichten."</string> <string name="permgrouplab_personalInfo" msgid="3519163141070533474">"Ihre persönlichen Informationen"</string> - <string name="permgroupdesc_personalInfo" product="tablet" msgid="6975389054186265786">"Direkter Zugriff auf die Kontakte und den Kalender Ihres Tablets."</string> - <string name="permgroupdesc_personalInfo" product="default" msgid="5488050357388806068">"Direkter Zugriff auf die Kontakte und den Kalender Ihres Telefons."</string> + <string name="permgroupdesc_personalInfo" product="tablet" msgid="6975389054186265786">"Direkter Zugriff auf die Kontakte und den Kalender Ihres Tablets"</string> + <string name="permgroupdesc_personalInfo" product="default" msgid="5488050357388806068">"Direkter Zugriff auf die Kontakte und den Kalender Ihres Telefons"</string> <string name="permgrouplab_location" msgid="635149742436692049">"Ihren Standort"</string> <string name="permgroupdesc_location" msgid="2430258821648348660">"Ihren physischen Standort überwachen"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Netzwerkkommunikation"</string> - <string name="permgroupdesc_network" msgid="5035763698958415998">"Ermöglicht Anwendungen den Zugriff auf verschiedene Netzwerkfunktionen."</string> + <string name="permgroupdesc_network" msgid="5035763698958415998">"Ermöglicht Anwendungen den Zugriff auf verschiedene Netzwerkfunktionen"</string> <string name="permgrouplab_accounts" msgid="3359646291125325519">"Ihre Konten"</string> <string name="permgroupdesc_accounts" msgid="4948732641827091312">"Zugriff auf verfügbare Konten"</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"Hardware-Steuerelemente"</string> @@ -177,14 +177,14 @@ <string name="permgroupdesc_developmentTools" msgid="9056431193893809814">"Funktionen nur für Anwendungsentwickler vorgesehen."</string> <string name="permgrouplab_storage" msgid="1971118770546336966">"Speicher"</string> <string name="permgroupdesc_storage" product="nosdcard" msgid="7442318502446874999">"Zugriff auf USB-Speicher"</string> - <string name="permgroupdesc_storage" product="default" msgid="9203302214915355774">"Greift auf die SD-Karte zu."</string> + <string name="permgroupdesc_storage" product="default" msgid="9203302214915355774">"Zugriff auf SD-Karte"</string> <string name="permlab_statusBar" msgid="7417192629601890791">"Statusleiste deaktivieren oder ändern"</string> - <string name="permdesc_statusBar" msgid="1365473595331989732">"Ermöglicht der Anwendung, die Statusanzeige zu deaktivieren oder Systemsymbole hinzuzufügen oder zu entfernen."</string> + <string name="permdesc_statusBar" msgid="1365473595331989732">"Ermöglicht der Anwendung, die Statusanzeige zu deaktivieren oder Systemsymbole hinzuzufügen oder zu entfernen"</string> <string name="permlab_statusBarService" msgid="7247281911387931485">"Statusleiste"</string> - <string name="permdesc_statusBarService" msgid="4097605867643520920">"Ermöglicht der Anwendung, zur Statusleiste zu werden."</string> + <string name="permdesc_statusBarService" msgid="4097605867643520920">"Ermöglicht der Anwendung, zur Statusleiste zu werden"</string> <string name="permlab_expandStatusBar" msgid="1148198785937489264">"Statusleiste ein-/ausblenden"</string> - <string name="permdesc_expandStatusBar" msgid="7088604400110768665">"Ermöglicht der Anwendung, die Statusleiste ein- oder auszublenden."</string> - <string name="permlab_processOutgoingCalls" msgid="1136262550878335980">"Abgehende Anrufe abfangen"</string> + <string name="permdesc_expandStatusBar" msgid="7088604400110768665">"Ermöglicht der Anwendung, die Statusleiste ein- oder auszublenden"</string> + <string name="permlab_processOutgoingCalls" msgid="1136262550878335980">"Ausgehende Anrufe abfangen"</string> <string name="permdesc_processOutgoingCalls" msgid="2228988201852654461">"Ermöglicht einer Anwendung, abgehende Anrufe zu verarbeiten und die zu wählende Nummer zu ändern. Schädliche Anwendungen können so abgehende Anrufe eventuell überwachen, umleiten oder verhindern."</string> <string name="permlab_receiveSms" msgid="2697628268086208535">"SMS empfangen"</string> <string name="permdesc_receiveSms" msgid="6298292335965966117">"Ermöglicht der Anwendung, Kurzmitteilungen zu empfangen und zu verarbeiten. Schädliche Anwendungen können Ihre Nachrichten möglicherweise überwachen oder löschen, bevor sie angezeigt werden."</string> @@ -207,13 +207,13 @@ <string name="permlab_setDebugApp" msgid="4339730312925176742">"Fehlerbeseitigung für Anwendung aktivieren"</string> <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Ermöglicht einer Anwendung, die Fehlerbeseitigung für eine andere Anwendung zu aktivieren. Schädliche Anwendungen können so andere Anwendungen löschen."</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"UI-Einstellungen ändern"</string> - <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Ermöglicht einer Anwendung, die aktuelle Konfiguration zu ändern, etwa das Gebietsschema oder die Schriftgröße."</string> + <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Ermöglicht einer Anwendung, die aktuelle Konfiguration zu ändern, etwa das Gebietsschema oder die Schriftgröße"</string> <string name="permlab_enableCarMode" msgid="5684504058192921098">"Automodus aktivieren"</string> - <string name="permdesc_enableCarMode" msgid="5673461159384850628">"Ermöglicht einer Anwendung, den Automodus zu aktivieren."</string> + <string name="permdesc_enableCarMode" msgid="5673461159384850628">"Ermöglicht einer Anwendung, den Automodus zu aktivieren"</string> <string name="permlab_killBackgroundProcesses" msgid="8373714752793061963">"Hintergrundprozesse beenden"</string> <string name="permdesc_killBackgroundProcesses" msgid="2908829602869383753">"Ermöglicht einer Anwendung, Hintergrundprozesse anderer Anwendungen auch bei ausreichendem Speicher zu beenden."</string> <string name="permlab_forceStopPackages" msgid="1447830113260156236">"Beenden anderer Anwendungen erzwingen"</string> - <string name="permdesc_forceStopPackages" msgid="7263036616161367402">"Ermöglicht einer Anwendung, das Beenden anderer Anwendungen zu erzwingen."</string> + <string name="permdesc_forceStopPackages" msgid="7263036616161367402">"Ermöglicht einer Anwendung, das Beenden anderer Anwendungen zu erzwingen"</string> <string name="permlab_forceBack" msgid="1804196839880393631">"Schließen von Anwendung erzwingen"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"Ermöglicht einer Anwendung, alle Aktivitäten, die im Vordergrund ablaufen, zu beenden und in den Hintergrund zu schieben. Sollte nicht für normale Anwendungen benötigt werden."</string> <string name="permlab_dump" msgid="1681799862438954752">"Systeminternen Status abrufen"</string> @@ -241,9 +241,9 @@ <string name="permlab_internalSystemWindow" msgid="2148563628140193231">"nicht autorisierte Fenster anzeigen"</string> <string name="permdesc_internalSystemWindow" msgid="5895082268284998469">"Ermöglicht die Erstellung von Fenstern, die von der Benutzeroberfläche des internen Systems verwendet werden. Nicht für normale Anwendungen geeignet."</string> <string name="permlab_systemAlertWindow" msgid="3372321942941168324">"Warnungen auf Systemebene anzeigen"</string> - <string name="permdesc_systemAlertWindow" msgid="2884149573672821318">"Ermöglicht einer Anwendung, Fenster mit Systemwarnungen anzuzeigen. Schädliche Anwendungen können so das gesamte Display einnehmen."</string> + <string name="permdesc_systemAlertWindow" msgid="2884149573672821318">"Ermöglicht einer Anwendung, Fenster mit Systemwarnungen anzuzeigen. Schädliche Anwendungen können so die Kontrolle über das gesamte Display übernehmen."</string> <string name="permlab_setAnimationScale" msgid="2805103241153907174">"Allgemeine Animationsgeschwindigkeit einstellen"</string> - <string name="permdesc_setAnimationScale" msgid="7181522138912391988">"Ermöglicht einer Anwendung, die allgemeine Animationsgeschwindigkeit (schnellere oder langsamere Animationen) jederzeit anzupassen."</string> + <string name="permdesc_setAnimationScale" msgid="7181522138912391988">"Ermöglicht einer Anwendung, die allgemeine Animationsgeschwindigkeit (schnellere oder langsamere Animationen) jederzeit anzupassen"</string> <string name="permlab_manageAppTokens" msgid="17124341698093865">"Anwendungs-Tokens verwalten"</string> <string name="permdesc_manageAppTokens" msgid="977127907524195988">"Ermöglicht Anwendungen, Ihre eigenen Tokens zu erstellen und zu verwalten. Hierbei wird die normale Z-Reihenfolge umgangen. Dies sollte nicht für normale Anwendungen benötigt werden."</string> <string name="permlab_injectEvents" msgid="1378746584023586600">"Tasten und Steuerungstasten drücken"</string> @@ -262,24 +262,24 @@ <string name="permlab_setOrientation" msgid="3365947717163866844">"Bildschirmausrichtung ändern"</string> <string name="permdesc_setOrientation" msgid="6335814461615851863">"Ermöglicht der Anwendung, die Bildschirmdrehung jederzeit zu ändern. Sollte nicht für normale Anwendungen benötigt werden."</string> <string name="permlab_signalPersistentProcesses" msgid="4255467255488653854">"Linux-Signale an Anwendungen senden"</string> - <string name="permdesc_signalPersistentProcesses" msgid="3565530463215015289">"Ermöglicht der Anwendung, das Senden des gelieferten Signals an alle anhaltenden Prozesse zu fordern."</string> + <string name="permdesc_signalPersistentProcesses" msgid="3565530463215015289">"Ermöglicht der Anwendung, das Senden des gelieferten Signals an alle anhaltenden Prozesse zu fordern"</string> <string name="permlab_persistentActivity" msgid="8659652042401085862">"Anwendungen permanent ausführen"</string> - <string name="permdesc_persistentActivity" msgid="5037199778265006008">"Ermöglicht einer Anwendung, eigene Komponenten persistent zu machen, damit das System diese nicht für andere Anwendungen nutzen kann."</string> + <string name="permdesc_persistentActivity" msgid="5037199778265006008">"Ermöglicht einer Anwendung, eigene Komponenten persistent zu machen, damit das System diese nicht für andere Anwendungen nutzen kann"</string> <string name="permlab_deletePackages" msgid="3343439331576348805">"Anwendungen löschen"</string> <string name="permdesc_deletePackages" msgid="3634943677518723314">"Ermöglicht einer Anwendung, Android-Pakete zu löschen. Schädliche Anwendungen können so wichtige Anwendungen löschen."</string> <string name="permlab_clearAppUserData" msgid="2192134353540277878">"Daten anderer Anwendungen löschen"</string> - <string name="permdesc_clearAppUserData" msgid="7546345080434325456">"Ermöglicht einer Anwendung das Löschen von Nutzerdaten."</string> + <string name="permdesc_clearAppUserData" msgid="7546345080434325456">"Ermöglicht einer Anwendung das Löschen von Nutzerdaten"</string> <string name="permlab_deleteCacheFiles" msgid="1518556602634276725">"Caches anderer Anwendungen löschen"</string> - <string name="permdesc_deleteCacheFiles" msgid="2283074077168165971">"Ermöglicht einer Anwendung, Cache-Dateien zu löschen."</string> + <string name="permdesc_deleteCacheFiles" msgid="2283074077168165971">"Ermöglicht einer Anwendung, Cache-Dateien zu löschen"</string> <string name="permlab_getPackageSize" msgid="4799785352306641460">"Speicherplatz der Anwendung abrufen"</string> - <string name="permdesc_getPackageSize" msgid="5557253039670753437">"Ermöglicht einer Anwendung, ihre Code-, Daten- und Cache-Größe abzurufen."</string> + <string name="permdesc_getPackageSize" msgid="5557253039670753437">"Ermöglicht einer Anwendung, ihre Code-, Daten- und Cache-Größe abzurufen"</string> <string name="permlab_installPackages" msgid="335800214119051089">"Anwendungen direkt installieren"</string> <string name="permdesc_installPackages" msgid="526669220850066132">"Ermöglicht einer Anwendung, neue oder aktualisierte Android-Pakete zu installieren. Schädliche Anwendungen können so neue Anwendungen mit beliebig umfangreichen Berechtigungen hinzufügen."</string> <string name="permlab_clearAppCache" msgid="4747698311163766540">"Alle Cache-Daten der Anwendung löschen"</string> <string name="permdesc_clearAppCache" product="tablet" msgid="3097119797652477973">"Ermöglicht einer Anwendung, Tablet-Speicher durch das Löschen von Dateien im Cache-Verzeichnis der Anwendung freizugeben. Der Zugriff beschränkt sich in der Regel auf Systemprozesse."</string> <string name="permdesc_clearAppCache" product="default" msgid="7740465694193671402">"Ermöglicht einer Anwendung, Telefonspeicher durch das Löschen von Dateien im Cache-Verzeichnis der Anwendung freizugeben. Der Zugriff beschränkt sich in der Regel auf Systemprozesse."</string> <string name="permlab_movePackage" msgid="728454979946503926">"Anwendungsressourcen verschieben"</string> - <string name="permdesc_movePackage" msgid="6323049291923925277">"Ermöglicht einer Anwendung, Anwendungsressourcen von interne auf externe Medien zu verschieben und umgekehrt."</string> + <string name="permdesc_movePackage" msgid="6323049291923925277">"Ermöglicht einer Anwendung, Anwendungsressourcen von internen auf externe Medien zu verschieben und umgekehrt"</string> <string name="permlab_readLogs" msgid="6615778543198967614">"Lesen vertraulicher Protokolldaten"</string> <string name="permdesc_readLogs" product="tablet" msgid="4077356893924755294">"Ermöglicht einer Anwendung, die verschiedenen Protokolldateien des Systems zu lesen. So können allgemeine Informationen zu den auf Ihrem Tablet durchgeführten Aktionen eingesehen werden. Diese können persönliche oder geheime Daten enthalten."</string> <string name="permdesc_readLogs" product="default" msgid="8896449437464867766">"Ermöglicht einer Anwendung, die verschiedenen Protokolldateien des Systems zu lesen. So können allgemeine Informationen zu den auf Ihrem Telefon durchgeführten Aktionen eingesehen werden. Diese können persönliche oder geheime Daten enthalten."</string> @@ -300,8 +300,8 @@ <string name="permdesc_receiveBootCompleted" product="tablet" msgid="7530977064379338199">"Ermöglicht einer Anwendung, sich selbst zu starten, sobald das System gebootet wurde. Dadurch kann es länger dauern, bis das Tablet gestartet wird, und durch die ständige Aktivität der Anwendung wird die gesamte Leistung des Tablets beeinträchtigt."</string> <string name="permdesc_receiveBootCompleted" product="default" msgid="698336728415008796">"Ermöglicht einer Anwendung, sich selbst zu starten, sobald das System gebootet wurde. Dadurch kann es länger dauern, bis das Telefon gestartet wird, und durch die ständige Aktivität der Anwendung wird die gesamte Leistung des Telefons beeinträchtigt."</string> <string name="permlab_broadcastSticky" msgid="7919126372606881614">"dauerhaften Broadcast senden"</string> - <string name="permdesc_broadcastSticky" product="tablet" msgid="6322249605930062595">"Ermöglicht einer Anwendung, dauerhafte Broadcasts zu senden, die auch nach dem Ende des Broadcasts bestehen bleiben. Schädliche Anwendungen können das Tablet langsam oder instabil machen, da zu viel Speicherplatz belegt ist."</string> - <string name="permdesc_broadcastSticky" product="default" msgid="1920045289234052219">"Ermöglicht einer Anwendung, dauerhafte Broadcasts zu senden, die auch nach dem Ende des Broadcasts bestehen bleiben. Schädliche Anwendungen können das Telefon langsam oder unstabil machen, da zuviel Speicherplatz belegt ist."</string> + <string name="permdesc_broadcastSticky" product="tablet" msgid="6322249605930062595">"Ermöglicht einer Anwendung, dauerhafte Broadcasts zu senden, die auch nach dem Ende des Broadcasts bestehen bleiben. Schädliche Anwendungen können das Tablet langsam oder instabil machen, da zu viel Speicherplatz belegt wird."</string> + <string name="permdesc_broadcastSticky" product="default" msgid="1920045289234052219">"Ermöglicht einer Anwendung, dauerhafte Broadcasts zu senden, die auch nach dem Ende des Broadcasts bestehen bleiben. Schädliche Anwendungen können das Telefon langsam oder unstabil machen, da zuviel Speicherplatz belegt wird."</string> <string name="permlab_readContacts" msgid="6219652189510218240">"Kontaktdaten lesen"</string> <string name="permdesc_readContacts" product="tablet" msgid="7596158687301157686">"Ermöglicht einer Anwendung, alle auf Ihrem Tablet gespeicherten Kontaktdaten (Adressen) zu lesen. Schädliche Anwendungen können so Ihre Daten an andere Personen senden."</string> <string name="permdesc_readContacts" product="default" msgid="3371591512896545975">"Ermöglicht einer Anwendung, alle auf Ihrem Telefon gespeicherten Kontaktdaten (Adressen) zu lesen. Schädliche Anwendungen können so Ihre Daten an andere Personen senden."</string> @@ -312,8 +312,8 @@ <string name="permdesc_readCalendar" product="tablet" msgid="5905870265734599678">"Ermöglicht einer Anwendung, alle auf Ihrem Tablet gespeicherten Kalenderereignisse zu lesen. Schädliche Anwendungen können so Ihre Kalenderereignisse an andere Personen senden."</string> <string name="permdesc_readCalendar" product="default" msgid="5533029139652095734">"Ermöglicht einer Anwendung, alle auf Ihrem Telefon gespeicherten Kalenderereignisse zu lesen. Schädliche Anwendungen können so Ihre Kalenderereignisse an andere Personen senden."</string> <string name="permlab_writeCalendar" msgid="3894879352594904361">"Kalendereinträge hinzufügen oder ändern und E-Mails an Gäste senden"</string> - <string name="permdesc_writeCalendar" msgid="2988871373544154221">"Ermöglicht einer Anwendung, Einträge auf Ihrem Kalender hinzuzufügen oder zu ändern, die E-Mails an Gäste senden können. Schädliche Anwendungen können so Ihre Kalenderdaten löschen oder verändern oder E-Mails versenden."</string> - <string name="permlab_accessMockLocation" msgid="8688334974036823330">"Falsche Standortquellen für Testzwecke"</string> + <string name="permdesc_writeCalendar" msgid="2988871373544154221">"Ermöglicht einer Anwendung, Einträge in Ihrem Kalender hinzuzufügen oder zu ändern, wodurch E-Mails an Gäste gesendet werden können. Schädliche Anwendungen können so Ihre Kalenderdaten löschen oder verändern oder E-Mails versenden."</string> + <string name="permlab_accessMockLocation" msgid="8688334974036823330">"Simulierte Standortquellen für Testzwecke"</string> <string name="permdesc_accessMockLocation" msgid="7648286063459727252">"Erstellt falsche Standortquellen für Testzwecke. Schädliche Anwendungen können so den von den echten Standortquellen wie GPS oder Netzwerkanbieter zurückgegebenen Standort und/oder Status überschreiben."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"Auf zusätzliche Dienstanbieterbefehle für Standort zugreifen"</string> <string name="permdesc_accessLocationExtraCommands" msgid="1948144701382451721">"Zugriff auf zusätzliche Dienstanbieterbefehle für Standort. Schädliche Anwendungen könnten so die Funktionsweise von GPS oder anderen Standortquellen beeinträchtigen."</string> @@ -324,29 +324,29 @@ <string name="permdesc_accessFineLocation" product="default" msgid="7411213317434337331">"Zugriff auf genaue Standortquellen wie GPS auf dem Telefon (falls verfügbar). Schädliche Anwendungen können damit bestimmen, so Sie sich befinden und so Ihren Akku zusätzlich belasten."</string> <string name="permlab_accessCoarseLocation" msgid="4642255009181975828">"ungefährer (netzwerkbasierter) Standort"</string> <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3704633168985466045">"Greift auf Quellen mit ungefähren Standortbestimmungen wie die Datenbank des Mobilfunknetzes zu, um falls möglich den ungefähren Standort des Tablets zu bestimmen. Schädliche Anwendungen können damit herauszufinden, wo Sie sich ungefähr befinden."</string> - <string name="permdesc_accessCoarseLocation" product="default" msgid="8235655958070862293">"Greift auf Quellen mit ungefähren Standortbestimmungen wie die Datenbank des Mobilfunknetzwerks zu, um falls möglich den ungefähren Standort des Telefons zu bestimmen. Schädliche Anwendungen können damit herauszufinden, wo Sie sich ungefähr befinden."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="8235655958070862293">"Greift auf Quellen mit ungefähren Standortbestimmungen wie die Datenbank des Mobilfunknetzes zu, um falls möglich den ungefähren Standort des Tablets festzustellen. Schädliche Anwendungen können damit herausfinden, wo Sie sich ungefähr befinden"</string> <string name="permlab_accessSurfaceFlinger" msgid="2363969641792388947">"Auf SurfaceFlinger zugreifen"</string> - <string name="permdesc_accessSurfaceFlinger" msgid="6805241830020733025">"Ermöglicht einer Anwendung, die systemnahen SurfaceFlinger-Funktionen zu verwenden."</string> + <string name="permdesc_accessSurfaceFlinger" msgid="6805241830020733025">"Ermöglicht einer Anwendung, die systemnahen SurfaceFlinger-Funktionen zu verwenden"</string> <string name="permlab_readFrameBuffer" msgid="6690504248178498136">"Frame-Puffer lesen"</string> - <string name="permdesc_readFrameBuffer" msgid="7530020370469942528">"Ermöglicht einer Anwendung, den Content des Frame-Puffers zu lesen."</string> + <string name="permdesc_readFrameBuffer" msgid="7530020370469942528">"Ermöglicht einer Anwendung, den Content des Frame-Puffers zu lesen"</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"Audio-Einstellungen ändern"</string> - <string name="permdesc_modifyAudioSettings" msgid="5793461287365991922">"Ermöglicht der Anwendung, Änderungen an allgemeinen Audioeinstellungen wie Lautstärke und Weiterleitung vorzunehmen."</string> + <string name="permdesc_modifyAudioSettings" msgid="5793461287365991922">"Ermöglicht der Anwendung, Änderungen an allgemeinen Audioeinstellungen wie Lautstärke und Weiterleitung vorzunehmen"</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"Audio aufnehmen"</string> - <string name="permdesc_recordAudio" msgid="6493228261176552356">"Ermöglicht der Anwendung, auf den Pfad für Audioaufzeichnungen zuzugreifen."</string> + <string name="permdesc_recordAudio" msgid="6493228261176552356">"Ermöglicht der Anwendung, auf den Pfad für Audioaufzeichnungen zuzugreifen"</string> <string name="permlab_camera" msgid="3616391919559751192">"Bilder und Videos aufnehmen"</string> <string name="permdesc_camera" msgid="6004878235852154239">"Ermöglicht der Anwendung, Fotos und Videos mit der Kamera aufzunehmen. So kann die Anwendung jederzeit Bilder aus dem Sichtfeld der Kamera erfassen."</string> <string name="permlab_brick" product="tablet" msgid="2961292205764488304">"Tablet dauerhaft deaktivieren"</string> - <string name="permlab_brick" product="default" msgid="8337817093326370537">"Telefon dauerhaft deaktivieren."</string> + <string name="permlab_brick" product="default" msgid="8337817093326370537">"Telefon dauerhaft deaktivieren"</string> <string name="permdesc_brick" product="tablet" msgid="7379164636920817963">"Ermöglicht der Anwendung, das gesamte Tablet dauerhaft zu deaktivieren. Dies birgt hohe Risiken."</string> <string name="permdesc_brick" product="default" msgid="5569526552607599221">"Ermöglicht der Anwendung, das gesamte Telefon dauerhaft zu deaktivieren. Dies birgt hohe Risiken."</string> <string name="permlab_reboot" product="tablet" msgid="3436634972561795002">"Tablet-Neustart erzwingen"</string> <string name="permlab_reboot" product="default" msgid="2898560872462638242">"Neustart des Telefons erzwingen"</string> <string name="permdesc_reboot" product="tablet" msgid="4555793623560701557">"Ermöglicht der Anwendung, einen Neustart des Tablets zu erzwingen."</string> - <string name="permdesc_reboot" product="default" msgid="7914933292815491782">"Ermöglicht der Anwendung, einen Neustart des Telefons zu erzwingen."</string> + <string name="permdesc_reboot" product="default" msgid="7914933292815491782">"Ermöglicht der Anwendung, einen Neustart des Telefons zu erzwingen"</string> <string name="permlab_mount_unmount_filesystems" msgid="1761023272170956541">"Dateisysteme bereitstellen oder Bereitstellung aufheben"</string> - <string name="permdesc_mount_unmount_filesystems" msgid="6253263792535859767">"Ermöglicht der Anwendung, Dateisysteme für austauschbare Datenträger bereitzustellen oder die Bereitstellung aufzuheben."</string> + <string name="permdesc_mount_unmount_filesystems" msgid="6253263792535859767">"Ermöglicht der Anwendung, Dateisysteme für austauschbare Datenträger bereitzustellen oder die Bereitstellung aufzuheben"</string> <string name="permlab_mount_format_filesystems" msgid="5523285143576718981">"Externen Speicher formatieren"</string> - <string name="permdesc_mount_format_filesystems" msgid="574060044906047386">"Ermöglicht der Anwendung, austauschbare Datenträger zu formatieren."</string> + <string name="permdesc_mount_format_filesystems" msgid="574060044906047386">"Ermöglicht der Anwendung, austauschbare Datenträger zu formatieren"</string> <string name="permlab_asec_access" msgid="3411338632002193846">"Informationen zum internen Speicher abrufen"</string> <string name="permdesc_asec_access" msgid="8820326551687285439">"Ermöglicht der Anwendung, Informationen zum internen Speicher abzurufen."</string> <string name="permlab_asec_create" msgid="6414757234789336327">"Internen Speicher erstellen"</string> @@ -358,15 +358,17 @@ <string name="permlab_asec_rename" msgid="7496633954080472417">"Internen Speicher umbenennen"</string> <string name="permdesc_asec_rename" msgid="2152829985238876790">"Ermöglicht der Anwendung, den internen Speicher umzubenennen."</string> <string name="permlab_vibrate" msgid="7768356019980849603">"Vibrationsalarm steuern"</string> - <string name="permdesc_vibrate" msgid="2886677177257789187">"Ermöglicht der Anwendung, den Vibrationsalarm zu steuern."</string> + <string name="permdesc_vibrate" msgid="2886677177257789187">"Ermöglicht der Anwendung, den Vibrationsalarm zu steuern"</string> <string name="permlab_flashlight" msgid="2155920810121984215">"Lichtanzeige steuern"</string> - <string name="permdesc_flashlight" msgid="6433045942283802309">"Ermöglicht der Anwendung, die Lichtanzeige zu steuern."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"auf USB-Geräte zugreifen"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Ermöglicht der Anwendung den Zugriff auf USB-Geräte."</string> + <string name="permdesc_flashlight" msgid="6433045942283802309">"Ermöglicht der Anwendung, die Lichtanzeige zu steuern"</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"MTP-Protokoll implementieren"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Erlaubt den Zugriff auf den Kernel-MTP-Treiber zur Implementierung des MTP-USB-Protokolls."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"Hardware testen"</string> - <string name="permdesc_hardware_test" msgid="3668894686500081699">"Ermöglicht einer Anwendung, verschiedene Peripherie-Geräte zu Hardware-Testzwecken zu steuern."</string> + <string name="permdesc_hardware_test" msgid="3668894686500081699">"Ermöglicht einer Anwendung, verschiedene Peripherie-Geräte zu Hardware-Testzwecken zu steuern"</string> <string name="permlab_callPhone" msgid="3925836347681847954">"Telefonnummern direkt anrufen"</string> <string name="permdesc_callPhone" msgid="3369867353692722456">"Ermöglicht dem Anwendungen, Rufnummern ohne Ihr Eingreifen zu wählen. Schädliche Anwendungen können für unerwartete Anrufe auf Ihrer Telefonrechnung verantwortlich sein. Das Wählen von Notrufnummern ist allerdings nicht möglich."</string> <string name="permlab_callPrivileged" msgid="4198349211108497879">"Alle Telefonnummern direkt anrufen"</string> @@ -387,80 +389,80 @@ <string name="permlab_wakeLock" product="tablet" msgid="1531731435011495015">"Standby-Modus des Tablets deaktivieren"</string> <string name="permlab_wakeLock" product="default" msgid="573480187941496130">"Standby-Modus deaktivieren"</string> <string name="permdesc_wakeLock" product="tablet" msgid="4032181488045338551">"Ermöglicht einer Anwendung, den Standby-Modus des Tablets zu deaktivieren."</string> - <string name="permdesc_wakeLock" product="default" msgid="7584036471227467099">"Ermöglicht einer Anwendung, den Standby-Modus des Telefons zu deaktivieren."</string> + <string name="permdesc_wakeLock" product="default" msgid="7584036471227467099">"Ermöglicht einer Anwendung, den Standby-Modus des Telefons zu deaktivieren"</string> <string name="permlab_devicePower" product="tablet" msgid="2787034722616350417">"Tablet ein- oder ausschalten"</string> <string name="permlab_devicePower" product="default" msgid="4928622470980943206">"Gerät ein- oder ausschalten"</string> <string name="permdesc_devicePower" product="tablet" msgid="3853773100100451905">"Ermöglicht der Anwendung, das Tablet ein- oder auszuschalten."</string> - <string name="permdesc_devicePower" product="default" msgid="4577331933252444818">"Ermöglicht der Anwendung, das Telefon ein- oder auszuschalten."</string> + <string name="permdesc_devicePower" product="default" msgid="4577331933252444818">"Ermöglicht der Anwendung, das Telefon ein- oder auszuschalten"</string> <string name="permlab_factoryTest" msgid="3715225492696416187">"In Werkstestmodus ausführen"</string> - <string name="permdesc_factoryTest" product="tablet" msgid="3952059318359653091">"Führt einen systemnahen Herstellertest durch, in dessen Rahmen auf die gesamte Tablet-Hardware zugegriffen werden kann. Nur verfügbar, wenn ein Tablet im Werkstestmodus ausgeführt wird."</string> - <string name="permdesc_factoryTest" product="default" msgid="8136644990319244802">"Führt einen systemnahen Herstellertest durch, in dessen Rahmen auf die gesamte Telefonhardware zugegriffen werden kann. Nur verfügbar, wenn ein Telefon im Werkstestmodus ausgeführt wird."</string> + <string name="permdesc_factoryTest" product="tablet" msgid="3952059318359653091">"Führt einen systemnahen Herstellertest durch, in dessen Rahmen auf die gesamte Tablet-Hardware zugegriffen werden kann. Nur verfügbar, wenn ein Tablet im Herstellertestmodus ausgeführt wird."</string> + <string name="permdesc_factoryTest" product="default" msgid="8136644990319244802">"Führt einen systemnahen Herstellertest durch, in dessen Rahmen auf die gesamte Telefon-Hardware zugegriffen werden kann. Nur verfügbar, wenn ein Telefon im Herstellertestmodus ausgeführt wird."</string> <string name="permlab_setWallpaper" msgid="6627192333373465143">"Hintergrund festlegen"</string> - <string name="permdesc_setWallpaper" msgid="6417041752170585837">"Ermöglicht der Anwendung, den System-Hintergrund festzulegen."</string> + <string name="permdesc_setWallpaper" msgid="6417041752170585837">"Ermöglicht der Anwendung, den System-Hintergrund festzulegen"</string> <string name="permlab_setWallpaperHints" msgid="3600721069353106851">"Größenhinweise für Hintergrund festlegen"</string> - <string name="permdesc_setWallpaperHints" msgid="6019479164008079626">"Ermöglicht der Anwendung, die Größenhinweise für den Hintergrund festzulegen."</string> + <string name="permdesc_setWallpaperHints" msgid="6019479164008079626">"Ermöglicht der Anwendung, die Größenhinweise für den Hintergrund festzulegen"</string> <string name="permlab_masterClear" msgid="2315750423139697397">"System auf Werkseinstellung zurücksetzen"</string> <string name="permdesc_masterClear" msgid="5033465107545174514">"Ermöglicht einer Anwendung, das System komplett auf Werkseinstellung zurückzusetzen. Hierbei werden alle Daten, Konfigurationen und installierten Anwendungen gelöscht."</string> <string name="permlab_setTime" msgid="2021614829591775646">"Zeit einstellen"</string> - <string name="permdesc_setTime" product="tablet" msgid="209693136361006073">"Ermöglicht einer Anwendung, die Uhrzeit des Tablets zu ändern."</string> - <string name="permdesc_setTime" product="default" msgid="667294309287080045">"Ermöglicht einer Anwendung, die Uhrzeit des Telefons zu ändern."</string> + <string name="permdesc_setTime" product="tablet" msgid="209693136361006073">"Ermöglicht einer Anwendung, die Uhrzeit des Tablets zu ändern"</string> + <string name="permdesc_setTime" product="default" msgid="667294309287080045">"Ermöglicht einer Anwendung, die Uhrzeit des Telefons zu ändern"</string> <string name="permlab_setTimeZone" msgid="2945079801013077340">"Zeitzone festlegen"</string> <string name="permdesc_setTimeZone" product="tablet" msgid="2522877107613885139">"Ermöglicht einer Anwendung, die Zeitzone des Tablets zu ändern."</string> - <string name="permdesc_setTimeZone" product="default" msgid="1902540227418179364">"Ermöglicht einer Anwendung, die Zeitzone des Telefons zu ändern."</string> + <string name="permdesc_setTimeZone" product="default" msgid="1902540227418179364">"Ermöglicht einer Anwendung, die Zeitzone des Telefons zu ändern"</string> <string name="permlab_accountManagerService" msgid="4829262349691386986">"Als Konto-Manager fungieren"</string> - <string name="permdesc_accountManagerService" msgid="6056903274106394752">"Ermöglicht einer Anwendung, Anrufe an Konto-Authentifizierer zu tätigen."</string> + <string name="permdesc_accountManagerService" msgid="6056903274106394752">"Ermöglicht einer Anwendung, Anrufe an Konto-Authentifizierer zu tätigen"</string> <string name="permlab_getAccounts" msgid="4549918644233460103">"bekannte Konten suchen"</string> <string name="permdesc_getAccounts" product="tablet" msgid="857622793935544694">"Ermöglicht einer Anwendung, eine Liste der dem Tablet bekannten Konten abzurufen."</string> - <string name="permdesc_getAccounts" product="default" msgid="6839262446413155394">"Ermöglicht einer Anwendung, eine Liste der dem Telefon bekannten Konten abzurufen."</string> + <string name="permdesc_getAccounts" product="default" msgid="6839262446413155394">"Ermöglicht einer Anwendung, eine Liste der dem Telefon bekannten Konten abzurufen"</string> <string name="permlab_authenticateAccounts" msgid="3940505577982882450">"Als Kontoauthentifizierer fungieren"</string> - <string name="permdesc_authenticateAccounts" msgid="4006839406474208874">"Ermöglicht einer Anwendung, die Kontoauthentifizierungsfunktionen des Konto-Managers zu verwenden, einschließlich die Funktionen zum Erstellen von Konten und zum Abrufen und Einstellen der entsprechenden Passwörter."</string> + <string name="permdesc_authenticateAccounts" msgid="4006839406474208874">"Ermöglicht einer Anwendung, die Kontoauthentifizierungsfunktionen des Konto-Managers zu verwenden, einschließlich die Funktionen zum Erstellen von Konten und zum Abrufen und Einstellen der entsprechenden Passwörter"</string> <string name="permlab_manageAccounts" msgid="4440380488312204365">"Kontoliste verwalten"</string> - <string name="permdesc_manageAccounts" msgid="8804114016661104517">"Ermöglicht einer Anwendung, Konten hinzuzufügen und zu entfernen oder deren Passwörter zu löschen."</string> + <string name="permdesc_manageAccounts" msgid="8804114016661104517">"Ermöglicht einer Anwendung, Konten hinzuzufügen und zu entfernen oder deren Passwörter zu löschen"</string> <string name="permlab_useCredentials" msgid="6401886092818819856">"Authentifizierungsinformationen eines Kontos verwenden"</string> - <string name="permdesc_useCredentials" msgid="7416570544619546974">"Ermöglicht einer Anwendung, Authentifizierungs-Token anzufordern."</string> + <string name="permdesc_useCredentials" msgid="7416570544619546974">"Ermöglicht einer Anwendung, Authentifizierungs-Token anzufordern"</string> <string name="permlab_accessNetworkState" msgid="6865575199464405769">"Netzwerkstatus anzeigen"</string> - <string name="permdesc_accessNetworkState" msgid="558721128707712766">"Ermöglicht einer Anwendung, den Status aller Netzwerke anzuzeigen."</string> + <string name="permdesc_accessNetworkState" msgid="558721128707712766">"Ermöglicht einer Anwendung, den Status aller Netzwerke anzuzeigen"</string> <string name="permlab_createNetworkSockets" msgid="9121633680349549585">"uneingeschränkter Internetzugriff"</string> - <string name="permdesc_createNetworkSockets" msgid="4593339106921772192">"Ermöglicht einer Anwendung, Netzwerk-Sockets einzurichten."</string> + <string name="permdesc_createNetworkSockets" msgid="4593339106921772192">"Ermöglicht einer Anwendung, Netzwerk-Sockets einzurichten"</string> <string name="permlab_writeApnSettings" msgid="7823599210086622545">"Einstellungen für Zugriffspunktname schreiben"</string> - <string name="permdesc_writeApnSettings" msgid="7443433457842966680">"Ermöglicht einer Anwendung, die APN-Einstellungen wie Proxy und Port eines Zugriffspunkts zu ändern."</string> + <string name="permdesc_writeApnSettings" msgid="7443433457842966680">"Ermöglicht einer Anwendung, die APN-Einstellungen wie Proxy und Port eines Zugriffspunkts zu ändern"</string> <string name="permlab_changeNetworkState" msgid="958884291454327309">"Netzwerkkonnektivität ändern"</string> - <string name="permdesc_changeNetworkState" msgid="4199958910396387075">"Ermöglicht einer Anwendung, den Status der Netzwerkkonnektivität zu ändern."</string> + <string name="permdesc_changeNetworkState" msgid="4199958910396387075">"Ermöglicht einer Anwendung, den Status der Netzwerkkonnektivität zu ändern"</string> <string name="permlab_changeTetherState" msgid="2702121155761140799">"Tethering-Konnektivität ändern"</string> - <string name="permdesc_changeTetherState" msgid="8905815579146349568">"Ermöglicht einer Anwendung, den Status der Tethering-Konnektivität zu ändern."</string> + <string name="permdesc_changeTetherState" msgid="8905815579146349568">"Ermöglicht einer Anwendung, den Status der Tethering-Konnektivität zu ändern"</string> <string name="permlab_changeBackgroundDataSetting" msgid="1400666012671648741">"Einstellung zur Verwendung von Hintergrunddaten ändern"</string> - <string name="permdesc_changeBackgroundDataSetting" msgid="1001482853266638864">"Ermöglicht einer Anwendung, die Einstellung der Verwendung von Hintergrunddaten zu ändern."</string> + <string name="permdesc_changeBackgroundDataSetting" msgid="1001482853266638864">"Ermöglicht einer Anwendung, die Einstellung der Verwendung von Hintergrunddaten zu ändern"</string> <string name="permlab_accessWifiState" msgid="8100926650211034400">"WLAN-Status anzeigen"</string> - <string name="permdesc_accessWifiState" msgid="485796529139236346">"Ermöglicht einer Anwendung, die Informationen zum WLAN-Status einzusehen."</string> + <string name="permdesc_accessWifiState" msgid="485796529139236346">"Ermöglicht einer Anwendung, die Informationen zum WLAN-Status einzusehen"</string> <string name="permlab_changeWifiState" msgid="7280632711057112137">"WLAN-Status ändern"</string> - <string name="permdesc_changeWifiState" msgid="2950383153656873267">"Ermöglicht einer Anwendung, eine Verbindung zu den WLAN-Zugangspunkten herzustellen und diese zu trennen oder Änderungen an den konfigurierten WLAN-Netzwerken vorzunehmen."</string> + <string name="permdesc_changeWifiState" msgid="2950383153656873267">"Ermöglicht einer Anwendung, eine Verbindung zu den WLAN-Zugangspunkten herzustellen und diese zu trennen oder Änderungen an den konfigurierten WLAN-Netzwerken vorzunehmen"</string> <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"WLAN-Multicast-Empfang zulassen"</string> <string name="permdesc_changeWifiMulticastState" msgid="8199464507656067553">"Ermöglicht einer Anwendung, Datenpakete zu empfangen, die nicht direkt an Ihr Gerät gerichtet sind. Dies kann bei der Erkennung von in der Nähe angebotenen Diensten hilfreich sein. Diese Einstellung verbraucht mehr Energie als der Nicht-Multicast-Modus."</string> <string name="permlab_bluetoothAdmin" msgid="1092209628459341292">"Bluetooth-Verwaltung"</string> <string name="permdesc_bluetoothAdmin" product="tablet" msgid="3511795757324345837">"Ermöglicht einer Anwendung, das lokale Bluetooth-Tablet zu konfigurieren, Remote-Geräte zu erkennen und eine Verbindung zu diesen herzustellen."</string> - <string name="permdesc_bluetoothAdmin" product="default" msgid="7256289774667054555">"Ermöglicht einer Anwendung, das lokale Bluetooth-Telefon zu konfigurieren, Remote-Geräte zu erkennen und eine Verbindung zu diesen herzustellen."</string> + <string name="permdesc_bluetoothAdmin" product="default" msgid="7256289774667054555">"Ermöglicht einer Anwendung, das lokale Bluetooth-Telefon zu konfigurieren, Remote-Geräte zu erkennen und eine Verbindung zu diesen herzustellen"</string> <string name="permlab_bluetooth" msgid="8361038707857018732">"Bluetooth-Verbindungen herstellen"</string> <string name="permdesc_bluetooth" product="tablet" msgid="4191941825910543803">"Ermöglicht einer Anwendung, die Konfiguration des lokalen Bluetooth-Tablets einzusehen und Verbindungen mit Partnergeräten herzustellen und zu akzeptieren."</string> - <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Ermöglicht einer Anwendung, die Konfiguration des lokalen Bluetooth-Telefons einzusehen und Verbindungen mit Partnergeräten herzustellen und zu akzeptieren."</string> + <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Ermöglicht einer Anwendung, die Konfiguration des lokalen Bluetooth-Telefons einzusehen und Verbindungen mit Partnergeräten herzustellen und zu akzeptieren"</string> <string name="permlab_nfc" msgid="4423351274757876953">"Nahfeldkommunikation steuern"</string> - <string name="permdesc_nfc" msgid="9171401851954407226">"Ermöglicht einer Anwendung die Kommunikation mit Tags für die Nahfeldkommunikation, Karten und Readern."</string> + <string name="permdesc_nfc" msgid="9171401851954407226">"Ermöglicht einer Anwendung die Kommunikation mit Tags für Nahfeldkommunikation, Karten und Lesegeräte"</string> <string name="permlab_disableKeyguard" msgid="4977406164311535092">"Tastensperre deaktivieren"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Ermöglicht einer Anwendung, die Tastensperre sowie den damit verbundenen Passwortschutz zu deaktivieren. So wird die Tastensperre vom Telefon deaktiviert, wenn ein Anruf eingeht, und nach Beendigung des Anrufs wieder aktiviert."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"Synchronisierungseinstellungen lesen"</string> - <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Ermöglicht einer Anwendung, die Synchronisierungseinstellungen zu lesen, etwa ob die Synchronisierung für Kontakte aktiviert ist oder nicht."</string> + <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Ermöglicht einer Anwendung, die Synchronisierungseinstellungen zu lesen, etwa ob die Synchronisierung für Kontakte aktiviert ist oder nicht"</string> <string name="permlab_writeSyncSettings" msgid="6297138566442486462">"Synchronisierungseinstellungen schreiben"</string> - <string name="permdesc_writeSyncSettings" msgid="2498201614431360044">"Ermöglicht einer Anwendung, die Synchronisierungseinstellungen zu ändern, etwa ob die Synchronisierung für Kontakte aktiviert ist oder nicht."</string> + <string name="permdesc_writeSyncSettings" msgid="2498201614431360044">"Ermöglicht einer Anwendung, die Synchronisierungseinstellungen zu ändern, etwa ob die Synchronisierung für Kontakte aktiviert ist oder nicht"</string> <string name="permlab_readSyncStats" msgid="7396577451360202448">"Synchronisierungsstatistiken lesen"</string> - <string name="permdesc_readSyncStats" msgid="7511448343374465000">"Ermöglicht einer Anwendung, die Synchronisierungsstatistiken zu lesen, etwa den Verlauf der bereits durchgeführten Synchronisierungen."</string> + <string name="permdesc_readSyncStats" msgid="7511448343374465000">"Ermöglicht einer Anwendung, die Synchronisierungsstatistiken zu lesen, etwa den Verlauf der bereits durchgeführten Synchronisierungen"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"abonnierte Feeds lesen"</string> - <string name="permdesc_subscribedFeedsRead" msgid="3622200625634207660">"Ermöglicht einer Anwendung, Details zu den zurzeit synchronisierten Feeds abzurufen."</string> + <string name="permdesc_subscribedFeedsRead" msgid="3622200625634207660">"Ermöglicht einer Anwendung, Details zu den zurzeit synchronisierten Feeds abzurufen"</string> <string name="permlab_subscribedFeedsWrite" msgid="9015246325408209296">"abonnierte Feeds schreiben"</string> <string name="permdesc_subscribedFeedsWrite" msgid="8121607099326533878">"Ermöglicht einer Anwendung, Änderungen an den kürzlich synchronisierten Feeds vorzunehmen. Schädliche Anwendungen könnten so Ihre synchronisierten Feeds ändern."</string> <string name="permlab_readDictionary" msgid="432535716804748781">"nutzerdefiniertes Wörterbuch lesen"</string> - <string name="permdesc_readDictionary" msgid="1082972603576360690">"Ermöglicht einer Anwendung, alle privaten Wörter, Namen und Ausdrücke zu lesen, die ein Nutzer in seinem Wörterbuch gespeichert hat."</string> + <string name="permdesc_readDictionary" msgid="1082972603576360690">"Ermöglicht einer Anwendung, alle privaten Wörter, Namen und Ausdrücke zu lesen, die ein Nutzer in seinem Wörterbuch gespeichert hat"</string> <string name="permlab_writeDictionary" msgid="6703109511836343341">"in nutzerdefiniertes Wörterbuch schreiben"</string> - <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Ermöglicht einer Anwendung, Ihrem Wörterbuch neue Einträge hinzuzufügen."</string> - <string name="permlab_sdcardWrite" product="nosdcard" msgid="85430876310764752">"USB-Speicherinh. ändern/lösch."</string> + <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Ermöglicht einer Anwendung, Ihrem Wörterbuch neue Einträge hinzuzufügen"</string> + <string name="permlab_sdcardWrite" product="nosdcard" msgid="85430876310764752">"USB-Speicherinhalt ändern/löschen"</string> <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"SD-Karten-Inhalt ändern/löschen"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Ermöglicht der Anwendung Schreiben in USB-Speicher"</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Ermöglicht einer Anwendung, auf die SD-Karte zu schreiben"</string> @@ -469,7 +471,7 @@ <string name="permlab_cache_filesystem" msgid="5656487264819669824">"Zugriff auf das Cache-Dateisystem"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Gewährt einer Anwendung Lese- und Schreibzugriff auf das Cache-Dateisystem."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"Internetanrufe tätigen/annehmen"</string> - <string name="permdesc_use_sip" msgid="6320376185606661843">"Ermöglicht einer Anwendung die Verwendung des SIP-Dienstes zum Tätigen/Annehmen von Internetanrufen."</string> + <string name="permdesc_use_sip" msgid="6320376185606661843">"Ermöglicht einer Anwendung die Verwendung des SIP-Dienstes zum Tätigen/Annehmen von Internetanrufen"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Passwortregeln festlegen"</string> <string name="policydesc_limitPassword" msgid="9083400080861728056">"Zulässige Länge und Zeichen für Passwörter zum Entsperren des Displays festlegen"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Versuche zum Entsperren des Displays überwachen"</string> @@ -478,14 +480,14 @@ <string name="policylab_resetPassword" msgid="2620077191242688955">"Passwort zum Entsperren des Displays ändern"</string> <string name="policydesc_resetPassword" msgid="5391240616981297361">"Passwort zum Entsperren des Displays ändern"</string> <string name="policylab_forceLock" msgid="2274085384704248431">"Display sperren"</string> - <string name="policydesc_forceLock" msgid="5696964126226028442">"Steuern Sie, wie und wann das Display gesperrt wird."</string> + <string name="policydesc_forceLock" msgid="5696964126226028442">"Festlegen, wie und wann das Display gesperrt wird"</string> <string name="policylab_wipeData" msgid="3910545446758639713">"Alle Daten löschen"</string> <string name="policydesc_wipeData" product="tablet" msgid="314455232799486222">"Auf Werkseinstellungen zurücksetzen und Daten auf dem Tablet ohne Warnung löschen"</string> <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Auf Werkseinstellungen zurücksetzen und Daten auf dem Telefon ohne Warnung löschen"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Den globalen Proxy des Geräts festlegen"</string> - <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Den globalen Proxy des Geräts zur Verwendung während der Aktivierung der Richtlinie festlegen. Nur der erste Geräteadministrator kann den gültigen globalen Proxy festlegen."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Ablauf des Passworts festlegen"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Zeitraum bis zur Änderung des Passworts für die Bildschirmsperre festlegen"</string> + <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Den bei aktivierter Richtlinie zu verwendenden globalen Proxy des Geräts festlegen. Nur der erste Geräteadministrator kann den gültigen globalen Proxy festlegen."</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Ablauf von Sperr-Passwort festlegen"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Legen Sie fest, wie häufig das Passwort zum Sperren des Bildschirms geändert werden muss."</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Speicherverschlüsselung"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Anforderung, dass gespeicherte Anwendungsdaten verschlüsselt werden"</string> <string-array name="phoneTypes"> @@ -495,19 +497,19 @@ <item msgid="1103601433382158155">"Fax (geschäftl.)"</item> <item msgid="1735177144948329370">"Fax (privat)"</item> <item msgid="603878674477207394">"Pager"</item> - <item msgid="1650824275177931637">"Sonstige"</item> + <item msgid="1650824275177931637">"Andere"</item> <item msgid="9192514806975898961">"Benutzerdefiniert"</item> </string-array> <string-array name="emailAddressTypes"> <item msgid="8073994352956129127">"Privat"</item> <item msgid="7084237356602625604">"Geschäftlich"</item> - <item msgid="1112044410659011023">"Sonstige"</item> + <item msgid="1112044410659011023">"Andere"</item> <item msgid="2374913952870110618">"Benutzerdefiniert"</item> </string-array> <string-array name="postalAddressTypes"> <item msgid="6880257626740047286">"Privat"</item> <item msgid="5629153956045109251">"Geschäftlich"</item> - <item msgid="4966604264500343469">"Sonstige"</item> + <item msgid="4966604264500343469">"Andere"</item> <item msgid="4932682847595299369">"Benutzerdefiniert"</item> </string-array> <string-array name="imAddressTypes"> @@ -518,7 +520,7 @@ </string-array> <string-array name="organizationTypes"> <item msgid="7546335612189115615">"Geschäftlich"</item> - <item msgid="4378074129049520373">"Sonstige"</item> + <item msgid="4378074129049520373">"Andere"</item> <item msgid="3455047468583965104">"Benutzerdefiniert"</item> </string-array> <string-array name="imProtocols"> @@ -593,10 +595,10 @@ <string name="relationTypeMother" msgid="4578571352962758304">"Mutter"</string> <string name="relationTypeParent" msgid="4755635567562925226">"Elternteil"</string> <string name="relationTypePartner" msgid="7266490285120262781">"Partner"</string> - <string name="relationTypeReferredBy" msgid="101573059844135524">"Weitergeleitet von"</string> + <string name="relationTypeReferredBy" msgid="101573059844135524">"Empfehlung von"</string> <string name="relationTypeRelative" msgid="1799819930085610271">"Verwandter"</string> <string name="relationTypeSister" msgid="1735983554479076481">"Schwester"</string> - <string name="relationTypeSpouse" msgid="394136939428698117">"Gatte/Gattin"</string> + <string name="relationTypeSpouse" msgid="394136939428698117">"Ehepartner"</string> <string name="sipAddressTypeCustom" msgid="2473580593111590945">"Benutzerdefiniert"</string> <string name="sipAddressTypeHome" msgid="6093598181069359295">"Privat"</string> <string name="sipAddressTypeWork" msgid="6920725730797099047">"Geschäftlich"</string> @@ -609,7 +611,7 @@ <string name="keyguard_label_text" msgid="861796461028298424">"Drücken Sie zum Entsperren die Menütaste und dann auf \"0\"."</string> <string name="emergency_call_dialog_number_for_display" msgid="696192103195090970">"Notrufnummer"</string> <string name="lockscreen_carrier_default" msgid="8812714795156374435">"(kein Dienst)"</string> - <string name="lockscreen_screen_locked" msgid="7288443074806832904">"Display gesperrt."</string> + <string name="lockscreen_screen_locked" msgid="7288443074806832904">"Display gesperrt"</string> <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"Drücken Sie die Menütaste, um das Telefon zu entsperren oder einen Notruf zu tätigen."</string> <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"Zum Entsperren die Menütaste drücken"</string> <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"Muster zum Entsperren zeichnen"</string> @@ -628,7 +630,7 @@ <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Bitte legen Sie eine SIM-Karte ein."</string> <string name="emergency_calls_only" msgid="6733978304386365407">"Nur Notrufe"</string> <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Netzwerk gesperrt"</string> - <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM-Karte ist gesperrt. PUK-Eingabe erforderlich."</string> + <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"PUK-Sperre auf SIM"</string> <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Weitere Informationen finden Sie in der Bedienungsanleitung oder wenden Sie sich an den Kundendienst."</string> <string name="lockscreen_sim_locked_message" msgid="8066660129206001039">"Bitte PIN-Code eingeben"</string> <string name="lockscreen_sim_unlock_progress_dialog_message" msgid="595323214052881264">"SIM-Karte wird entsperrt..."</string> @@ -672,7 +674,7 @@ <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"Browserverlauf und Lesezeichen lesen"</string> - <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Ermöglicht der Anwendung, alle URLs, die mit dem Browser besucht wurden, sowie alle Lesezeichen des Browsers zu lesen."</string> + <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Ermöglicht der Anwendung, alle URLs, die mit dem Browser besucht wurden, sowie alle Lesezeichen des Browsers zu lesen"</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"Browserverlauf und Lesezeichen schreiben"</string> <string name="permdesc_writeHistoryBookmarks" product="tablet" msgid="7193514090469945307">"Ermöglicht einer Anwendung, den auf Ihrem Tablet gespeicherten Browserverlauf und die Lesezeichen zu ändern. Schädliche Anwendungen können so Ihre Browserdaten löschen oder ändern."</string> <string name="permdesc_writeHistoryBookmarks" product="default" msgid="945571990357114950">"Ermöglicht einer Anwendung, den auf Ihrem Telefon gespeicherten Browserverlauf und die Lesezeichen zu ändern. Schädliche Anwendungen können so Ihre Browserdaten löschen oder ändern."</string> @@ -691,7 +693,7 @@ <string name="menu_space_shortcut_label" msgid="2410328639272162537">"Leerzeichen"</string> <string name="menu_enter_shortcut_label" msgid="2743362785111309668">"Enter"</string> <string name="menu_delete_shortcut_label" msgid="3658178007202748164">"löschen"</string> - <string name="search_go" msgid="8298016669822141719">"Suche"</string> + <string name="search_go" msgid="8298016669822141719">"Suchen"</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Vor 1 Monat"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Vor mehr als 1 Monat"</string> <plurals name="num_seconds_ago"> @@ -801,7 +803,7 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Textaktionen"</string> <string name="low_internal_storage_view_title" msgid="1399732408701697546">"Geringer Speicher"</string> <string name="low_internal_storage_view_text" product="tablet" msgid="4231085657068852042">"Kaum noch Tablet-Speicher frei"</string> - <string name="low_internal_storage_view_text" product="default" msgid="635106544616378836">"Kaum noch Telefonspeicher frei."</string> + <string name="low_internal_storage_view_text" product="default" msgid="635106544616378836">"Kaum noch Telefonspeicher frei"</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Abbrechen"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -809,11 +811,13 @@ <string name="dialog_alert_title" msgid="2049658708609043103">"Achtung"</string> <string name="loading" msgid="1760724998928255250">"Wird geladen..."</string> <string name="capital_on" msgid="1544682755514494298">"EIN"</string> - <string name="capital_off" msgid="6815870386972805832">"Aus"</string> + <string name="capital_off" msgid="6815870386972805832">"AUS"</string> <string name="whichApplication" msgid="4533185947064773386">"Aktion durchführen mit"</string> - <string name="alwaysUse" msgid="4583018368000610438">"Standardmäßig für diese Aktion verwenden."</string> - <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Standardeinstellung zurücksetzen unter \"Einstellungen > Anwendungen > Anwendungen verwalten\"."</string> + <string name="alwaysUse" msgid="4583018368000610438">"Standardmäßig für diese Aktion verwenden"</string> + <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Standardeinstellung zurücksetzen unter \"Einstellungen > Anwendungen > Anwendungen verwalten\""</string> <string name="chooseActivity" msgid="1009246475582238425">"Aktion auswählen"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Diese Aktion kann von keiner Anwendung ausgeführt werden."</string> <string name="aerr_title" msgid="653922989522758100">"Tut uns leid!"</string> <string name="aerr_application" msgid="4683614104336409186">"Die Anwendung <xliff:g id="APPLICATION">%1$s</xliff:g> (Prozess <xliff:g id="PROCESS">%2$s</xliff:g>) wurde unerwartet beendet. Versuchen Sie es erneut."</string> @@ -832,13 +836,13 @@ <string name="smv_application" msgid="295583804361236288">"Die Anwendung <xliff:g id="APPLICATION">%1$s</xliff:g> (Prozess <xliff:g id="PROCESS">%2$s</xliff:g>) hat gegen ihre selbsterzwungene StrictMode-Richtlinie verstoßen."</string> <string name="smv_process" msgid="5120397012047462446">"Der Prozess <xliff:g id="PROCESS">%1$s</xliff:g> hat gegen seine selbsterzwungene StrictMode-Richtlinie verstoßen."</string> <string name="heavy_weight_notification" msgid="9087063985776626166">"<xliff:g id="APP">%1$s</xliff:g> läuft"</string> - <string name="heavy_weight_notification_detail" msgid="2423977499339403402">"Auswählen zum Wechseln in die Anwendung"</string> + <string name="heavy_weight_notification_detail" msgid="2423977499339403402">"Zum Wechseln in die Anwendung auswählen"</string> <string name="heavy_weight_switcher_title" msgid="1135403633766694316">"Anwendung wechseln?"</string> <string name="heavy_weight_switcher_text" msgid="4592075610079319667">"Es läuft gerade eine andere Anwendung, die vor dem Start einer neuen beendet werden muss."</string> <string name="old_app_action" msgid="493129172238566282">"Zu <xliff:g id="OLD_APP">%1$s</xliff:g> zurückkehren"</string> - <string name="old_app_description" msgid="942967900237208466">"Die neue Anwendung nicht starten."</string> + <string name="old_app_description" msgid="942967900237208466">"Die neue Anwendung nicht starten"</string> <string name="new_app_action" msgid="5472756926945440706">"<xliff:g id="OLD_APP">%1$s</xliff:g> starten"</string> - <string name="new_app_description" msgid="6830398339826789493">"Anwendung beenden, ohne zu speichern."</string> + <string name="new_app_description" msgid="6830398339826789493">"Anwendung beenden, ohne zu speichern"</string> <string name="sendText" msgid="5132506121645618310">"Aktion für Text auswählen"</string> <string name="volume_ringtone" msgid="6885421406845734650">"Klingeltonlautstärke"</string> <string name="volume_music" msgid="5421651157138628171">"Medienlautstärke"</string> @@ -885,14 +889,14 @@ <string name="usb_storage_notification_title" msgid="8175892554757216525">"USB-Verbindung"</string> <string name="usb_storage_notification_message" msgid="7380082404288219341">"Zum Kopieren von Dateien zum/vom Computer"</string> <string name="usb_storage_stop_notification_title" msgid="2336058396663516017">"USB-Speicher deaktivieren"</string> - <string name="usb_storage_stop_notification_message" msgid="2591813490269841539">"Auswählen, um USB-Speicher zu deaktivieren."</string> + <string name="usb_storage_stop_notification_message" msgid="2591813490269841539">"USB-Speicher deaktivieren: auswählen"</string> <string name="usb_storage_stop_title" msgid="660129851708775853">"USB-Speicher in Verwendung"</string> <string name="usb_storage_stop_message" product="nosdcard" msgid="1368842269463745067">"Stellen Sie vor dem Deaktivieren des USB-Speichers sicher, dass Sie den Android-USB-Speicher von Ihrem Computer getrennt (\"ausgeworfen\") haben."</string> - <string name="usb_storage_stop_message" product="default" msgid="3613713396426604104">"Stellen Sie vor dem Deaktivieren des USB-Speichers sicher, dass Sie Ihre Android-SD-Karte von Ihrem Computer getrennt (\"ausgeworfen\") haben."</string> + <string name="usb_storage_stop_message" product="default" msgid="3613713396426604104">"Achten Sie vor dem Deaktivieren des USB-Speichers darauf, dass Sie die Android-SD-Karte von Ihrem Computer getrennt (\"ausgeworfen\") haben."</string> <string name="usb_storage_stop_button_mount" msgid="7060218034900696029">"USB-Speicher deaktivieren"</string> <string name="usb_storage_stop_error_message" msgid="143881914840412108">"Beim Deaktivieren des USB-Speichers ist ein Problem aufgetreten. Überprüfen Sie, ob Sie den USB-Host getrennt haben, und versuchen Sie es erneut."</string> <string name="dlg_confirm_kill_storage_users_title" msgid="963039033470478697">"USB-Speicher aktivieren"</string> - <string name="dlg_confirm_kill_storage_users_text" msgid="3202838234780505886">"Wenn Sie den USB-Speicher aktivieren, werden einige von Ihnen verwendeten Anwendungen angehalten und sind möglicherweise nicht verfügbar, bis Sie den USB-Speicher wieder deaktivieren."</string> + <string name="dlg_confirm_kill_storage_users_text" msgid="3202838234780505886">"Wenn Sie den USB-Speicher aktivieren, werden einige von Ihnen verwendete Anwendungen angehalten und sind möglicherweise nicht verfügbar, bis Sie den USB-Speicher wieder deaktivieren."</string> <string name="dlg_error_title" msgid="8048999973837339174">"USB-Vorgang fehlgeschlagen"</string> <string name="dlg_ok" msgid="7376953167039865701">"OK"</string> <string name="extmedia_format_title" product="nosdcard" msgid="7980995592595097841">"USB-Sp. formatieren"</string> @@ -901,40 +905,40 @@ <string name="extmedia_format_message" product="default" msgid="3621369962433523619">"Möchten Sie die SD-Karte wirklich formatieren? Alle Daten auf Ihrer Karte gehen dann verloren."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"Format"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB-Debugging verbunden"</string> - <string name="adb_active_notification_message" msgid="8470296818270110396">"Auswählen, um USB-Debugging zu deaktivieren."</string> + <string name="adb_active_notification_message" msgid="8470296818270110396">"USB-Debugging deaktivieren: auswählen"</string> <string name="select_input_method" msgid="6865512749462072765">"Eingabemethode auswählen"</string> <string name="configure_input_methods" msgid="6324843080254191535">"Eingabemethoden konfigurieren"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"Kandidaten"</u></string> <string name="ext_media_checking_notification_title" product="nosdcard" msgid="3449816005351468560">"USB-Speicher wird vorbereitet."</string> - <string name="ext_media_checking_notification_title" product="default" msgid="5457603418970994050">"SD-Karte wird vorbereitet"</string> + <string name="ext_media_checking_notification_title" product="default" msgid="5457603418970994050">"SD-Karte wird vorbereitet..."</string> <string name="ext_media_checking_notification_message" msgid="8287319882926737053">"Suche nach Fehlern"</string> <string name="ext_media_nofs_notification_title" product="nosdcard" msgid="7788040745686229307">"USB-Speicher leer"</string> <string name="ext_media_nofs_notification_title" product="default" msgid="780477838241212997">"SD-Karte leer"</string> <string name="ext_media_nofs_notification_message" product="nosdcard" msgid="8623130522556087311">"USB-Speicher ist leer oder verfügt über ein nicht unterstütztes Dateisystem."</string> <string name="ext_media_nofs_notification_message" product="default" msgid="3817704088027829380">"SD-Karte ist leer oder verfügt über ein nicht unterstütztes Dateisystem."</string> <string name="ext_media_unmountable_notification_title" product="nosdcard" msgid="2090046769532713563">"USB-Speicher beschädigt"</string> - <string name="ext_media_unmountable_notification_title" product="default" msgid="6410723906019100189">"Beschädigte SD-Karte"</string> - <string name="ext_media_unmountable_notification_message" product="nosdcard" msgid="529021299294450667">"USB-Speicher ist beschädigt. Sie müssen ihn neu formatieren."</string> - <string name="ext_media_unmountable_notification_message" product="default" msgid="6902531775948238989">"Die SD-Karte ist beschädigt. Sie müssen Ihre Karte eventuell neu formatieren."</string> - <string name="ext_media_badremoval_notification_title" product="nosdcard" msgid="1661683031330951073">"USB-Speicher unerw. entfernt"</string> + <string name="ext_media_unmountable_notification_title" product="default" msgid="6410723906019100189">"SD-Karte beschädigt"</string> + <string name="ext_media_unmountable_notification_message" product="nosdcard" msgid="529021299294450667">"Der USB-Speicher ist beschädigt. Sie müssen ihn eventuell neu formatieren."</string> + <string name="ext_media_unmountable_notification_message" product="default" msgid="6902531775948238989">"Die SD-Karte ist beschädigt. Sie müssen sie eventuell neu formatieren."</string> + <string name="ext_media_badremoval_notification_title" product="nosdcard" msgid="1661683031330951073">"USB-Speicher unerwartet entfernt"</string> <string name="ext_media_badremoval_notification_title" product="default" msgid="6872152882604407837">"SD-Karte unerwartet entfernt"</string> <string name="ext_media_badremoval_notification_message" product="nosdcard" msgid="4329848819865594241">"Trennen Sie den USB-Speicher vor dem Entfernen, um Datenverlust zu vermeiden."</string> <string name="ext_media_badremoval_notification_message" product="default" msgid="7260183293747448241">"SD-Karte vor dem Entnehmen trennen, um Datenverlust zu vermeiden."</string> - <string name="ext_media_safe_unmount_notification_title" product="nosdcard" msgid="3967973893270360230">"USB-Speicher kann entf. werden"</string> + <string name="ext_media_safe_unmount_notification_title" product="nosdcard" msgid="3967973893270360230">"USB-Speicher kann entfernt werden."</string> <string name="ext_media_safe_unmount_notification_title" product="default" msgid="6729801130790616200">"SD-Karte kann entfernt werden."</string> <string name="ext_media_safe_unmount_notification_message" product="nosdcard" msgid="6142195361606493530">"Der USB-Speicher kann entfernt werden."</string> <string name="ext_media_safe_unmount_notification_message" product="default" msgid="568841278138377604">"Die SD-Karte kann entfernt werden."</string> <string name="ext_media_nomedia_notification_title" product="nosdcard" msgid="4486377230140227651">"USB-Speicher entfernt"</string> <string name="ext_media_nomedia_notification_title" product="default" msgid="8902518030404381318">"SD-Karte entfernt"</string> <string name="ext_media_nomedia_notification_message" product="nosdcard" msgid="6921126162580574143">"USB-Speicher entfernt. Neuen Datenträger einlegen"</string> - <string name="ext_media_nomedia_notification_message" product="default" msgid="3870120652983659641">"SD-Karte entfernt. Legen Sie eine neue ein."</string> + <string name="ext_media_nomedia_notification_message" product="default" msgid="3870120652983659641">"SD-Karte entfernt. Neue Karte einlegen"</string> <string name="activity_list_empty" msgid="4168820609403385789">"Keine passenden Aktivitäten gefunden"</string> <string name="permlab_pkgUsageStats" msgid="8787352074326748892">"Nutzungsstatistik der Komponente aktualisieren"</string> <string name="permdesc_pkgUsageStats" msgid="891553695716752835">"Ermöglicht die Änderung von gesammelten Nutzungsstatistiken der Komponente. Nicht für normale Anwendungen vorgesehen."</string> - <string name="permlab_copyProtectedData" msgid="1660908117394854464">"Ermöglicht das Aufrufen des Standard-Containerdienstes zum Kopieren von Inhalt. Keine Verwendung bei normalen Anwendungen."</string> - <string name="permdesc_copyProtectedData" msgid="537780957633976401">"Ermöglicht das Aufrufen des Standard-Containerdienstes zum Kopieren von Inhalt. Keine Verwendung bei normalen Anwendungen."</string> + <string name="permlab_copyProtectedData" msgid="1660908117394854464">"Ermöglicht das Aufrufen des Standard-Containerdienstes zum Kopieren von Inhalt. Nicht zum Gebrauch mit normalen Anwendungen."</string> + <string name="permdesc_copyProtectedData" msgid="537780957633976401">"Ermöglicht das Aufrufen des Standard-Containerdienstes zum Kopieren von Inhalt. Nicht zum Gebrauch mit normalen Anwendungen."</string> <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"Für Zoomeinstellung zweimal berühren"</string> <string name="gadget_host_error_inflating" msgid="2613287218853846830">"Fehler beim Vergrößern des Widgets"</string> <string name="ime_action_go" msgid="8320845651737369027">"Los"</string> @@ -963,7 +967,7 @@ <string name="pptp_vpn_description" msgid="2688045385181439401">"Point-to-Point-Tunneling-Protokoll"</string> <string name="l2tp_vpn_description" msgid="3750692169378923304">"Layer-2-Tunneling-Protokoll"</string> <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"L2TP/IPSec-VPN mit vorinstalliertem Schlüssel"</string> - <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"Zertifikat mit vorinstalliertem Schlüssel"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"L2TP/IPSec-VPN mit Zertifikat"</string> <string name="upload_file" msgid="2897957172366730416">"Datei auswählen"</string> <string name="no_file_chosen" msgid="6363648562170759465">"Keine Datei ausgewählt"</string> <string name="reset" msgid="2448168080964209908">"Zurücksetzen"</string> @@ -976,9 +980,9 @@ <string name="next_button_label" msgid="1080555104677992408">"Weiter"</string> <string name="skip_button_label" msgid="1275362299471631819">"Überspringen"</string> <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Hohe Mobildatennutzung"</string> - <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Weitere Informationen über die Mobildatennutzung durch Berühren aufrufen"</string> + <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Durch Berühren weitere Informationen zur Mobildatennutzung aufrufen"</string> <string name="throttled_notification_title" msgid="6269541897729781332">"Mobildatenlimit überschritten"</string> - <string name="throttled_notification_message" msgid="4712369856601275146">"Weitere Informationen über die Mobildatennutzung durch Berühren aufrufen"</string> + <string name="throttled_notification_message" msgid="4712369856601275146">"Durch Berühren weitere Informationen zur Mobildatennutzung aufrufen"</string> <string name="no_matches" msgid="8129421908915840737">"Keine Treffer"</string> <string name="find_on_page" msgid="1946799233822820384">"Auf Seite suchen"</string> <plurals name="matches_found"> @@ -999,7 +1003,7 @@ <string name="media_shared" product="nosdcard" msgid="5830814349250834225">"Der USB-Speicher wird derzeit von einem Computer verwendet."</string> <string name="media_shared" product="default" msgid="5706130568133540435">"Die SD-Karte wird derzeit von einem Computer verwendet."</string> <string name="media_unknown_state" msgid="729192782197290385">"Unbekannter Status des externen Speichermediums"</string> - <string name="share" msgid="1778686618230011964">"Freigeben"</string> + <string name="share" msgid="1778686618230011964">"Weitergeben"</string> <string name="find" msgid="4808270900322985960">"Suchen"</string> <string name="websearch" msgid="4337157977400211589">"Websuche"</string> <string name="gpsNotifTicker" msgid="5622683912616496172">"Standortabfrage von <xliff:g id="NAME">%s</xliff:g>"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index edcb213..8b9a8df 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Επιτρέπει στην εφαρμογή τον έλεγχο του δονητή."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"έλεγχος φακού"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Επιτρέπει στην εφαρμογή τον έλεγχο του φακού."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"πρόσβαση σε συσκευές USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Επιτρέπει στην εφαρμογή την πρόσβαση σε συσκευές USB."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"εφαρμογή πρωτοκόλλου MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Επιτρέπει την πρόσβαση στο πρόγραμμα οδήγησης kernel MTP για την εφαρμογή του πρωτοκόλλου MTP USB."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"δοκιμή υλικού"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Διαγραφή των δεδομένων του τηλεφώνου χωρίς προειδοποίηση με επαναφορά των εργοστασιακών δεδομένων"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Ρύθμιση του γενικού διακομιστή μεσολάβησης της συσκευής"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Ορίστε τη χρήση του γενικού διακομιστή μεσολάβησης της συσκευής όταν είναι ενεργοποιημένη η πολιτική. Μόνο ο διαχειριστής της πρώτης συσκευής ορίζει τον ισχύοντα γενικό διακομιστή μεσολάβησης."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Ορισμός λήξης κωδικού πρόσβασης"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Ελέγξτε πόσος χρόνος απομένει προτού πρέπει να αλλάξετε τον κωδικό πρόσβασης κλειδώματος της οθόνης"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Ορισμός λήξης κωδ. κλειδ. οθ."</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Επιλέξτε πόσο συχνά θα πρέπει να αλλάζει ο κωδικός πρόσβασης κλειδώματος οθόνης"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Ορισμός κρυπτογρ. αποθ. χώρου"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Να απαιτείται η κρυπτογράφηση των αποθηκευμένων δεδομένων εφαρμογής"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Χρήση από προεπιλογή για αυτήν την ενέργεια."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Εκκαθάριση προεπιλεγμένων σε Ρυθμίσεις αρχικής σελίδας > Εφαρμογές > Διαχείριση εφαρμογών."</string> <string name="chooseActivity" msgid="1009246475582238425">"Επιλέξτε μια ενέργεια"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Δεν υπάρχουν εφαρμογές, οι οποίες μπορούν να εκτελέσουν αυτήν την ενέργεια."</string> <string name="aerr_title" msgid="653922989522758100">"Λυπούμαστε!"</string> <string name="aerr_application" msgid="4683614104336409186">"Υπήρξε μη αναμενόμενη διακοπή της εφαρμογής <xliff:g id="APPLICATION">%1$s</xliff:g> (διαδικασία <xliff:g id="PROCESS">%2$s</xliff:g>). Προσπαθήστε ξανά."</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index b8f624e..0a511eb 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Allows the application to control the vibrator."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"control flashlight"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Allows the application to control the flashlight."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"access USB devices"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Allows the application to access USB devices."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"implement MTP protocol"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Allows access to the kernel MTP driver to implement the MTP USB protocol."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"test hardware"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Erase the phone\'s data without warning by performing a factory data reset"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Set the device global proxy"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Set the device\'s global proxy to be used while policy is enabled. Only the first device admin sets the effective global proxy."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Set password expiry"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Control how long before lock-screen password needs to be changed"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Set lock-screen password expiry"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Control how frequently the lock-screen password must be changed"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Set storage encryption"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Require that stored application data be encrypted"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Use by default for this action."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Clear default in Home Settings > Applications > Manage applications."</string> <string name="chooseActivity" msgid="1009246475582238425">"Select an action"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"No applications can perform this action."</string> <string name="aerr_title" msgid="653922989522758100">"Sorry!"</string> <string name="aerr_application" msgid="4683614104336409186">"The application <xliff:g id="APPLICATION">%1$s</xliff:g> (process <xliff:g id="PROCESS">%2$s</xliff:g>) has stopped unexpectedly. Please try again."</string> @@ -879,7 +883,7 @@ <string name="usb_storage_title" msgid="5901459041398751495">"USB connected"</string> <string name="usb_storage_message" product="nosdcard" msgid="6631094834151575841">"You have connected to your computer via USB. Touch the button below if you want to copy files between your computer and your Android‘s USB storage."</string> <string name="usb_storage_message" product="default" msgid="4510858346516069238">"You have connected to your computer via USB. Touch the button below if you want to copy files between your computer and your Android‘s SD card."</string> - <string name="usb_storage_button_mount" msgid="1052259930369508235">"Turn off USB storage"</string> + <string name="usb_storage_button_mount" msgid="1052259930369508235">"Turn on USB storage"</string> <string name="usb_storage_error_message" product="nosdcard" msgid="3276413764430468454">"There is a problem with using your USB storage for USB mass storage."</string> <string name="usb_storage_error_message" product="default" msgid="120810397713773275">"There is a problem with using your SD card for USB mass storage."</string> <string name="usb_storage_notification_title" msgid="8175892554757216525">"USB connected"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 35d425b..688565b 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -211,7 +211,7 @@ <string name="permlab_enableCarMode" msgid="5684504058192921098">"habilitar el modo de auto"</string> <string name="permdesc_enableCarMode" msgid="5673461159384850628">"Permite que una aplicación habilite el modo auto."</string> <string name="permlab_killBackgroundProcesses" msgid="8373714752793061963">"eliminar los procesos de fondo"</string> - <string name="permdesc_killBackgroundProcesses" msgid="2908829602869383753">"Permite que una aplicación elimine los procesos de fondo de otras aplicaciones, aun si la memoria no es baja."</string> + <string name="permdesc_killBackgroundProcesses" msgid="2908829602869383753">"Permite que una aplicación elimine los procesos de fondo de otras aplicaciones, aun si la no queda poco espacio en la memoria."</string> <string name="permlab_forceStopPackages" msgid="1447830113260156236">"forzar la detención de otras aplicaciones"</string> <string name="permdesc_forceStopPackages" msgid="7263036616161367402">"Permite que una aplicación provoque la detención de otras aplicaciones."</string> <string name="permlab_forceBack" msgid="1804196839880393631">"provocar que la aplicación se acerque"</string> @@ -257,7 +257,7 @@ <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Permite al propietario vincularse a la interfaz de nivel superior de un fondo de pantalla. Se debe evitar utilizarlo en aplicaciones normales."</string> <string name="permlab_bindRemoteViews" msgid="5697987759897367099">"vincular a un servicio de widget"</string> <string name="permdesc_bindRemoteViews" msgid="2930855984822926963">"Permite al propietario vincularse a la interfaz de nivel superior del servicio de widget. Se debe evitar utilizarlo en aplicaciones normales."</string> - <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interactuar con un administrador de dispositivo"</string> + <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interactuar con un administrador de dispositivos"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Permite que el propietario envíe sus intentos a un administrador de dispositivos. No se necesita para las aplicaciones normales."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"cambiar la orientación de la pantalla"</string> <string name="permdesc_setOrientation" msgid="6335814461615851863">"Admite una aplicación que cambia la rotación de la pantalla en cualquier momento. Se debe evitar utilizarlo en aplicaciones normales."</string> @@ -277,12 +277,12 @@ <string name="permdesc_installPackages" msgid="526669220850066132">"Admite una aplicación que instala paquetes de Android nuevos o actualizados. Las aplicaciones maliciosas pueden utilizarlo para agregar aplicaciones nuevas con permisos arbitrariamente potentes."</string> <string name="permlab_clearAppCache" msgid="4747698311163766540">"eliminar todos los datos de memoria caché de la aplicación"</string> <string name="permdesc_clearAppCache" product="tablet" msgid="3097119797652477973">"Permite que una aplicación libere espacio de almacenamiento en el tablet eliminando archivos del directorio de memoria caché de la aplicación. En general, el acceso es muy restringido para el proceso del sistema."</string> - <string name="permdesc_clearAppCache" product="default" msgid="7740465694193671402">"Admite una aplicación que libera espacio de almacenamiento en el teléfono al eliminar archivos del directorio de memoria caché de la aplicación. En general, el acceso es muy restringido para el proceso del sistema."</string> + <string name="permdesc_clearAppCache" product="default" msgid="7740465694193671402">"Permite que una aplicación libere espacio de almacenamiento en el teléfono borrando archivos del directorio de memoria caché de la aplicación. En general el acceso está muy restringido al proceso del sistema."</string> <string name="permlab_movePackage" msgid="728454979946503926">"Mover recursos de la aplicación"</string> <string name="permdesc_movePackage" msgid="6323049291923925277">"Permite a una aplicación mover recursos de aplicación de medios internos a externos y viceversa."</string> <string name="permlab_readLogs" msgid="6615778543198967614">"lee los datos confidenciales del registro"</string> <string name="permdesc_readLogs" product="tablet" msgid="4077356893924755294">"Permite que una aplicación lea diversos archivos de registro del sistema. Esto le permite descubrir información general acerca de lo que haces con el tablet, y puede potencialmente incluir información personal o privada."</string> - <string name="permdesc_readLogs" product="default" msgid="8896449437464867766">"Admite una aplicación que lee diversos archivos de registro del sistema. Esto te permite descubrir información general acerca de lo que haces con el teléfono, y puede potencialmente incluir información personal o privada."</string> + <string name="permdesc_readLogs" product="default" msgid="8896449437464867766">"Permite que una aplicación lea los diversos archivos de registro del sistema. Esto le permite descubrir información general acerca de lo que haces con el teléfono, y puede potencialmente incluir información personal o privada."</string> <string name="permlab_diagnostic" msgid="8076743953908000342">"leer y escribir a recursos dentro del grupo de diagnóstico"</string> <string name="permdesc_diagnostic" msgid="3121238373951637049">"Admite una aplicación que lee y escribe a cualquier recurso dentro del grupo de diagnóstico; por ejemplo, archivos con /dev. Esto puede afectar potencialmente la estabilidad y la seguridad del sistema. Debe utilizarlo SÓLO el fabricante o el operador en los diagnósticos específicos del hardware."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"activar o desactivar componentes de la aplicación"</string> @@ -296,15 +296,15 @@ <string name="permdesc_writeSecureSettings" msgid="5497873143539034724">"Permite a una aplicación modificar los datos de la configuración segura de los sistemas. Las aplicaciones normales no deben utilizarlo."</string> <string name="permlab_writeGservices" msgid="2149426664226152185">"modificar el mapa de servicios de Google"</string> <string name="permdesc_writeGservices" msgid="6602362746516676175">"Admite una aplicación que modifica el mapa de servicios de Google. Las aplicaciones normales no deben utilizarlo."</string> - <string name="permlab_receiveBootCompleted" msgid="7776779842866993377">"iniciar automáticamente durante la inicialización"</string> + <string name="permlab_receiveBootCompleted" msgid="7776779842866993377">"ejecutar automáticamente al iniciar"</string> <string name="permdesc_receiveBootCompleted" product="tablet" msgid="7530977064379338199">"Permite que una aplicación se inicie en cuanto el sistema haya finalizado la inicialización. Esto puede ocasionar que el tablet demore más en inicializar y que la aplicación retarde el funcionamiento total del tablet al estar en ejecución constante."</string> - <string name="permdesc_receiveBootCompleted" product="default" msgid="698336728415008796">"Admite una aplicación que se inicia cuando el sistema haya finalizado la inicialización. Esto puede ocasionar que se demore más tiempo en inicializar el teléfono y que la aplicación retarde el funcionamiento total del teléfono al estar en ejecución constante."</string> + <string name="permdesc_receiveBootCompleted" product="default" msgid="698336728415008796">"Permite que una aplicación se inicie en cuanto el sistema haya finalizado la inicialización. Esto puede ocasionar que el teléfono tarde más en inicializarse y que la aplicación demore el funcionamiento total del teléfono al estar en ejecución constante."</string> <string name="permlab_broadcastSticky" msgid="7919126372606881614">"enviar emisiones pegajosas"</string> <string name="permdesc_broadcastSticky" product="tablet" msgid="6322249605930062595">"Permite que una aplicación envíe emisiones adhesivas, que permanecen luego de que finaliza la emisión. Las aplicaciones maliciosas pueden hacer que la tableta funcione más lento y esté inestable haciendo que utilicen demasiada memoria."</string> <string name="permdesc_broadcastSticky" product="default" msgid="1920045289234052219">"Admite una aplicación que envía emisiones pegajosas, las cuales permanecen luego de que finaliza la emisión. Las aplicaciones maliciosas pueden hacer lento e inestable al teléfono, ya que ocasiona que utilice demasiada memoria."</string> <string name="permlab_readContacts" msgid="6219652189510218240">"leer datos de contacto"</string> <string name="permdesc_readContacts" product="tablet" msgid="7596158687301157686">"Permite que una aplicación lea todos los datos de de contacto (direcciones) almacenados en tu tablet. Las aplicaciones maliciosas pueden utilizarlo para enviar tus datos a otras personas."</string> - <string name="permdesc_readContacts" product="default" msgid="3371591512896545975">"Admite una aplicación que lee todos los datos de (direcciones) de contactos almacenados en tu teléfono. Las aplicaciones maliciosas pueden utilizarlo para enviar tus eventos de calendario a otras personas."</string> + <string name="permdesc_readContacts" product="default" msgid="3371591512896545975">"Permite que una aplicación lea todos los datos (direcciones) de contactos almacenados en tu tablet. Las aplicaciones maliciosas pueden utilizarlo para enviar tus datos a otras personas."</string> <string name="permlab_writeContacts" msgid="644616215860933284">"escribir datos de contacto"</string> <string name="permdesc_writeContacts" product="tablet" msgid="7782689510038568495">"Permite que una aplicación modifique los datos de (dirección) guardados en tu tablet. Las aplicaciones maliciosas pueden utilizarlo para borrar o modificar los datos de contacto."</string> <string name="permdesc_writeContacts" product="default" msgid="3924383579108183601">"Admite una aplicación que modifica los datos de (dirección de) contacto guardados en tu teléfono. Las aplicaciones maliciosas pueden utilizarlo para borrar o modificar los datos de contacto."</string> @@ -340,9 +340,9 @@ <string name="permdesc_brick" product="tablet" msgid="7379164636920817963">"Permite que la aplicación desactive todo el tablet de manera permanente. Esto es muy peligroso."</string> <string name="permdesc_brick" product="default" msgid="5569526552607599221">"Admite que la aplicación desactive todo el teléfono de manera permanente. Esto es muy peligroso."</string> <string name="permlab_reboot" product="tablet" msgid="3436634972561795002">"forzar reinicio del tablet"</string> - <string name="permlab_reboot" product="default" msgid="2898560872462638242">"provocar el reinicio del teléfono"</string> + <string name="permlab_reboot" product="default" msgid="2898560872462638242">"forzar reinicio del teléfono"</string> <string name="permdesc_reboot" product="tablet" msgid="4555793623560701557">"Permite que la aplicación provoque el reinicio del tablet."</string> - <string name="permdesc_reboot" product="default" msgid="7914933292815491782">"Admite que la aplicación provoque que el teléfono se reinicie."</string> + <string name="permdesc_reboot" product="default" msgid="7914933292815491782">"Permite que la aplicación fuerce el reinicio del tablet."</string> <string name="permlab_mount_unmount_filesystems" msgid="1761023272170956541">"montar y desmontar filesystems"</string> <string name="permdesc_mount_unmount_filesystems" msgid="6253263792535859767">"Admite que la aplicación monte y desmonte filesystems para obtener almacenamiento extraíble."</string> <string name="permlab_mount_format_filesystems" msgid="5523285143576718981">"espacio de almacenamiento externo del formato"</string> @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Admite que la aplicación controle el vibrador."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"controlar linterna"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Admite que la aplicación controle la linterna."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"acceder a dispositivos USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Permite que la aplicación acceda a dispositivos USB."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"implementar protocolo MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Permite acceso al driver kernel MTP para implementar el protocolo MTP USB."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"probar el hardware"</string> @@ -372,7 +374,7 @@ <string name="permlab_callPrivileged" msgid="4198349211108497879">"llamar directamente a cualquier número de teléfono"</string> <string name="permdesc_callPrivileged" msgid="244405067160028452">"Admite que la aplicación llame a cualquier número de teléfono, incluidos los números de emergencia, sin tu intervención. Las aplicaciones maliciosas pueden realizar llamadas innecesarias e ilegales a los servicios de emergencia."</string> <string name="permlab_performCdmaProvisioning" product="tablet" msgid="4842576994144604821">"iniciar directamente la configuración CDMA del tablet"</string> - <string name="permlab_performCdmaProvisioning" product="default" msgid="5604848095315421425">"comienza directamente la configuración CDMA del teléfono"</string> + <string name="permlab_performCdmaProvisioning" product="default" msgid="5604848095315421425">"iniciar directamente la configuración CDMA del teléfono"</string> <string name="permdesc_performCdmaProvisioning" msgid="6457447676108355905">"Admite la aplicación para comenzar con el aprovisionamiento CDMA. Las aplicaciones maliciosas pueden comenzar con el aprovisionamiento CDMA sin necesidad."</string> <string name="permlab_locationUpdates" msgid="7785408253364335740">"controlar las notificaciones de actualización de ubicación"</string> <string name="permdesc_locationUpdates" msgid="2300018303720930256">"Permite activar y desactivar las notificaciones de actualización de ubicación de la radio. Las aplicaciones normales no deben utilizarlo."</string> @@ -427,7 +429,7 @@ <string name="permlab_changeNetworkState" msgid="958884291454327309">"cambiar la conectividad de la red"</string> <string name="permdesc_changeNetworkState" msgid="4199958910396387075">"Permite que una aplicación cambie el estado de la conectividad de red."</string> <string name="permlab_changeTetherState" msgid="2702121155761140799">"Cambiar la conectividad de anclaje a red"</string> - <string name="permdesc_changeTetherState" msgid="8905815579146349568">"Permite que una aplicación cambie el estado de la conectividad de red del anclaje."</string> + <string name="permdesc_changeTetherState" msgid="8905815579146349568">"ermite que una aplicación cambie el estado de la conectividad de anclaje a red."</string> <string name="permlab_changeBackgroundDataSetting" msgid="1400666012671648741">"cambiar la configuración del uso de datos del fondo"</string> <string name="permdesc_changeBackgroundDataSetting" msgid="1001482853266638864">"Admite una aplicación que cambia la configuración del uso de datos del fondo."</string> <string name="permlab_accessWifiState" msgid="8100926650211034400">"ver el estado de Wi-Fi"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Borrar los datos del teléfono sin advertencias al restablecer la configuración original"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Configura el proxy global de dispositivo"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Configuración del proxy global de dispositivo que se utilizará mientras se habilita la política. Sólo la primera administración de dispositivo configura el proxy global efectivo."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Establecer la caducidad de la contraseña"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Verifica cuánto tiempo antes debes cambiar la contraseña de la pantalla de bloqueo"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Establecer la caducidad del bloqueo de pantalla"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Controlar cuán a menudo se debe cambiar la contraseña de bloqueo de pantalla"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Establecer la encriptación del almacenamiento"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Requiere que los datos almacenados de la aplicación estén encriptados"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Utilizar de manera predeterminada en esta acción."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Borrar la predeterminación en Configuración de la página principal > Aplicaciones > Administrar aplicaciones."</string> <string name="chooseActivity" msgid="1009246475582238425">"Seleccionar una acción"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Ninguna aplicación puede realizar esta acción."</string> <string name="aerr_title" msgid="653922989522758100">"¡Lo sentimos!"</string> <string name="aerr_application" msgid="4683614104336409186">"La aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> (proceso <xliff:g id="PROCESS">%2$s</xliff:g>) se ha detenido de forma imprevista. Vuelve a intentarlo."</string> @@ -831,7 +835,7 @@ <string name="launch_warning_original" msgid="188102023021668683">"<xliff:g id="APP_NAME">%1$s</xliff:g> se inició originalmente."</string> <string name="smv_application" msgid="295583804361236288">"La aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> (proceso <xliff:g id="PROCESS">%2$s</xliff:g>) ha violado su política StrictMode autoimpuesta."</string> <string name="smv_process" msgid="5120397012047462446">"El proceso <xliff:g id="PROCESS">%1$s</xliff:g> ha violado su política StrictMode autoimpuesta."</string> - <string name="heavy_weight_notification" msgid="9087063985776626166">"<xliff:g id="APP">%1$s</xliff:g> Correr"</string> + <string name="heavy_weight_notification" msgid="9087063985776626166">"<xliff:g id="APP">%1$s</xliff:g> en ejecución"</string> <string name="heavy_weight_notification_detail" msgid="2423977499339403402">"Selecciona cambiar la aplicación"</string> <string name="heavy_weight_switcher_title" msgid="1135403633766694316">"¿Deseas cambiar aplicaciones?"</string> <string name="heavy_weight_switcher_text" msgid="4592075610079319667">"Ya se está ejecutando una aplicación que debe detenerse antes de iniciar una nueva."</string> @@ -919,17 +923,17 @@ <string name="ext_media_unmountable_notification_message" product="nosdcard" msgid="529021299294450667">"Almacenamiento USB dañado. Es posible que debas reformatearlo."</string> <string name="ext_media_unmountable_notification_message" product="default" msgid="6902531775948238989">"Tarjeta SD dañada. Es posible que debas reformatearla."</string> <string name="ext_media_badremoval_notification_title" product="nosdcard" msgid="1661683031330951073">"Almacenamiento USB extraído inesperadamente"</string> - <string name="ext_media_badremoval_notification_title" product="default" msgid="6872152882604407837">"Tarjeta SD extraída de forma imprevista"</string> + <string name="ext_media_badremoval_notification_title" product="default" msgid="6872152882604407837">"Almacenamiento USB extraído de forma imprevista"</string> <string name="ext_media_badremoval_notification_message" product="nosdcard" msgid="4329848819865594241">"Desmontar el almacenamiento USB antes de extraerlo para evitar la pérdida de datos."</string> <string name="ext_media_badremoval_notification_message" product="default" msgid="7260183293747448241">"Desmontar la tarjeta SD antes de extraerla para evitar la pérdida de datos."</string> <string name="ext_media_safe_unmount_notification_title" product="nosdcard" msgid="3967973893270360230">"Es seguro extraer el almacenamiento USB"</string> - <string name="ext_media_safe_unmount_notification_title" product="default" msgid="6729801130790616200">"Tarjeta SD fácil de extraer"</string> + <string name="ext_media_safe_unmount_notification_title" product="default" msgid="6729801130790616200">"Es seguro extraer la tarjeta SD"</string> <string name="ext_media_safe_unmount_notification_message" product="nosdcard" msgid="6142195361606493530">"Puedes extraer de forma segura el almacenamiento USB."</string> - <string name="ext_media_safe_unmount_notification_message" product="default" msgid="568841278138377604">"Puedes eliminar la tarjeta SD sin riesgos."</string> + <string name="ext_media_safe_unmount_notification_message" product="default" msgid="568841278138377604">"Puedes extraer de forma segura la tarjeta SD."</string> <string name="ext_media_nomedia_notification_title" product="nosdcard" msgid="4486377230140227651">"Almacenamiento USB extraído"</string> <string name="ext_media_nomedia_notification_title" product="default" msgid="8902518030404381318">"Tarjeta SD extraída"</string> <string name="ext_media_nomedia_notification_message" product="nosdcard" msgid="6921126162580574143">"Almacenamiento USB eliminado. Insertar nuevos medios."</string> - <string name="ext_media_nomedia_notification_message" product="default" msgid="3870120652983659641">"Tarjeta SD eliminada. Inserta una nueva."</string> + <string name="ext_media_nomedia_notification_message" product="default" msgid="3870120652983659641">"Tarjeta SD extraída. Insertar una nueva."</string> <string name="activity_list_empty" msgid="4168820609403385789">"No se encontraron actividades coincidentes"</string> <string name="permlab_pkgUsageStats" msgid="8787352074326748892">"actualizar la estadística de uso de los componentes"</string> <string name="permdesc_pkgUsageStats" msgid="891553695716752835">"Permite la modificación de estadísticas recopiladas sobre el uso de componentes. Las aplicaciones normales no deben utilizarlo."</string> @@ -962,8 +966,8 @@ <string name="chooser_wallpaper" msgid="7873476199295190279">"Cambiar fondo de pantalla"</string> <string name="pptp_vpn_description" msgid="2688045385181439401">"Protocolo de túnel punto a punto"</string> <string name="l2tp_vpn_description" msgid="3750692169378923304">"Protocolo de túnel de nivel 2"</string> - <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"Clave previamente compartida según L2TP/IPSec VPN"</string> - <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"Certificado según L2TP/IPSec VPN"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"VPN L2TP/IPSec basada en clave compartida previamente"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"VPN L2TP/IPSec basada en certificado"</string> <string name="upload_file" msgid="2897957172366730416">"Elegir archivo"</string> <string name="no_file_chosen" msgid="6363648562170759465">"No se seleccionó un archivo."</string> <string name="reset" msgid="2448168080964209908">"Restablecer"</string> @@ -991,7 +995,7 @@ <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"Borrando almacenamiento USB..."</string> <string name="progress_erasing" product="default" msgid="2115214724367534095">"Borrando tarjeta SD..."</string> <string name="format_error" product="nosdcard" msgid="4320339096529911637">"No pudo borrar el almacenamiento USB."</string> - <string name="format_error" product="default" msgid="1343380371925238343">"No pudo borrar la tarjeta SD."</string> + <string name="format_error" product="default" msgid="1343380371925238343">"No se pudo borrar la tarjeta SD."</string> <string name="media_bad_removal" msgid="7960864061016603281">"Se ha extraído la tarjeta SD antes de ser desmontada."</string> <string name="media_checking" product="nosdcard" msgid="418188720009569693">"Se está verificando el almacenamiento USB en este momento."</string> <string name="media_checking" product="default" msgid="7334762503904827481">"Se está verificando la tarjeta SD en este momento."</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 41fa758..9ab0169 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Permite que la aplicación controle la función de vibración."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"controlar linterna"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Permite que la aplicación controle la función de linterna."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"acceso a dispositivos USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"La aplicación puede acceder a dispositivos USB."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"implementar protocolo MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Permite el acceso al controlador MTP del kernel para implementar el protocolo USB MTP."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"probar hardware"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Borrado de los datos del teléfono sin avisar restableciendo datos de fábrica"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Definir el servidor proxy global"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Define el servidor proxy global que se debe utilizar mientras la política esté habilitada. Solo el primer administrador de dispositivos define el servidor proxy global efectivo."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Definir caducidad de contraseña"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Permite controlar cuándo se debe cambiar la contraseña de bloqueo de la pantalla."</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Definir caducidad bloqueo pantalla"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Controlar la frecuencia con la que se debe cambiar el bloqueo de pantalla"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Encriptación de almacenamiento"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Exige que se encripten los datos de la aplicación almacenados."</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Utilizar de forma predeterminada para esta acción"</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Borrar valores predeterminados en la página de configuración de la pantalla de inicio del teléfono > Aplicaciones > Administrar aplicaciones\"."</string> <string name="chooseActivity" msgid="1009246475582238425">"Seleccionar una acción"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Ninguna aplicación puede realizar esta acción."</string> <string name="aerr_title" msgid="653922989522758100">"Lo sentimos."</string> <string name="aerr_application" msgid="4683614104336409186">"La aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> (proceso <xliff:g id="PROCESS">%2$s</xliff:g>) se ha interrumpido inesperadamente. Inténtalo de nuevo."</string> @@ -974,7 +978,7 @@ <string name="tethered_notification_message" msgid="3067108323903048927">"Toca para iniciar la configuración."</string> <string name="back_button_label" msgid="2300470004503343439">"Atrás"</string> <string name="next_button_label" msgid="1080555104677992408">"Siguiente"</string> - <string name="skip_button_label" msgid="1275362299471631819">"Omitir"</string> + <string name="skip_button_label" msgid="1275362299471631819">"Saltar"</string> <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Uso elevado datos móviles"</string> <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Más información sobre uso de datos"</string> <string name="throttled_notification_title" msgid="6269541897729781332">"Límite datos superado"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index fa74391..655f250 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"به برنامه کاربردی اجازه می دهد لرزاننده را کنترل کند."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"کنترل چراغ قوه"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"به برنامه کاربردی اجازه می دهد چراغ قوه را کنترل کند."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"دسترسی به دستگاه های USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"به برنامه کاربردی اجازه می دهد به دستگاه های USB دسترسی پیدا کند."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"اعمال پروتکل MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"دسترسی به درایور کرنل MTP جهت اعمال پروتکل MTP USB را اجازه می دهد."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"تست سخت افزار"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"پاک کردن داده های گوشی بدون هشدار با انجام یک عملکرد بازنشانی داده های کارخانه"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"تنظیم پروکسی جهانی دستگاه"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"پروکسی جهانی دستگاه مورد نظر را جهت استفاده هنگام فعال بودن خط مشی تنظیم کنید. فقط اولین سرپرست دستگاه پروکسی جهانی مفید را تنظیم می کند."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"تنظیم زمان انقضای رمز ورود"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"کنترل مدت زمانی که رمز ورود صفحه قفل قبل از تغییر یافتن لازم دارد"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"تنظیم زمان انقضای رمز ورود قفل صفحه"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"کنترل تعداد دفعات تغییر رمز ورود قفل صفحه"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"تنظیم رمزگذاری حافظه"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"نیاز به رمزگذاری داده های برنامه کاربردی ذخیره شده دارد"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"استفاده به صورت پیش فرض برای این عملکرد."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"پاک کردن موارد پیش فرض در تنظیمات صفحه اصلی > برنامه های کاربردی > مدیریت برنامه ها."</string> <string name="chooseActivity" msgid="1009246475582238425">"انتخاب یک عملکرد"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"هیچ برنامه ای نمی تواند این عملکرد را اجرا کند."</string> <string name="aerr_title" msgid="653922989522758100">"متأسفیم!"</string> <string name="aerr_application" msgid="4683614104336409186">"برنامه کاربردی <xliff:g id="APPLICATION">%1$s</xliff:g> ( فرآیند <xliff:g id="PROCESS">%2$s</xliff:g>) به طور غیر منتظره ای متوقف شد. لطفاً دوباره امتحان کنید."</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 9c525cf..28312a1 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Antaa sovelluksen hallita värinää."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"hallitse taskulamppua"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Antaa sovelluksen hallita lamppua."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"käytä USB-tiloja"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Antaa sovelluksen käyttää USB-tiloja."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"ota käyttöön MTP-protokolla"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Antaa sovelluksen käyttää kernel-MTP-ajuria ja ottaa käyttöön MTP USB-protokollan."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"testaa laitteistoa"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Tyhjennä puhelimen tiedot varoituksetta palauttamalla tehdasasetukset."</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Aseta laitteen yleinen välityspalvelin"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Aseta laitteen yleinen välityspalvelin käyttöön, kun käytäntö on käytössä. Vain ensimmäinen laitteen järjestelmänhallitsija voi asettaa käytettävän yleisen välityspalvelimen."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Aseta salasanan voimassaoloaika"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Valitse, kuinka pian ruudunlukituksen poiston salasana tulee vaihtaa"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Aseta ruudunlukituksen salasanan voimassaoloaika"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Määritä, miten usein ruudunlukituksen salasana tulee vaihtaa"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Aseta tallennustilan salaus"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Pakota tallennettujen sovellustietojen salaus"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Käytä oletuksena tälle toiminnolle."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Tyhjennä oletusasetus kohdassa Etusivun asetukset > Sovellukset > Hallinnoi sovelluksia."</string> <string name="chooseActivity" msgid="1009246475582238425">"Valitse toiminto"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Yksikään sovellus ei voi suorittaa tätä toimintoa."</string> <string name="aerr_title" msgid="653922989522758100">"Pahoittelemme!"</string> <string name="aerr_application" msgid="4683614104336409186">"Sovellus <xliff:g id="APPLICATION">%1$s</xliff:g> (prosessi <xliff:g id="PROCESS">%2$s</xliff:g>) pysähtyi yllättäen. Yritä uudelleen."</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 39276af..7a6c43a 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -126,7 +126,7 @@ <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Synchronisation"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"Trop de contenus supprimés (<xliff:g id="CONTENT_TYPE">%s</xliff:g>)."</string> <string name="low_memory" product="tablet" msgid="2292820184396262278">"La mémoire de la tablette est pleine. Supprimez des fichiers pour libérer de l\'espace."</string> - <string name="low_memory" product="default" msgid="6632412458436461203">"La mémoire du téléphone est pleine ! Supprimez des fichiers pour libérer de l\'espace."</string> + <string name="low_memory" product="default" msgid="6632412458436461203">"La mémoire du téléphone est pleine. Supprimez des fichiers pour libérer de l\'espace."</string> <string name="me" msgid="6545696007631404292">"Moi"</string> <string name="power_dialog" product="tablet" msgid="8545351420865202853">"Options de la tablette"</string> <string name="power_dialog" product="default" msgid="1319919075463988638">"Options du téléphone"</string> @@ -159,8 +159,8 @@ <string name="permgrouplab_messages" msgid="7521249148445456662">"Vos messages"</string> <string name="permgroupdesc_messages" msgid="7045736972019211994">"Permet de lire et rédiger vos SMS, e-mails et autres messages."</string> <string name="permgrouplab_personalInfo" msgid="3519163141070533474">"Vos informations personnelles"</string> - <string name="permgroupdesc_personalInfo" product="tablet" msgid="6975389054186265786">"Accéder directement aux contacts et à l\'agenda stockés sur la tablette"</string> - <string name="permgroupdesc_personalInfo" product="default" msgid="5488050357388806068">"Accédez directement aux contacts et à l\'agenda enregistrés sur votre téléphone."</string> + <string name="permgroupdesc_personalInfo" product="tablet" msgid="6975389054186265786">"Accéder directement aux contacts et à l\'agenda enregistrés sur la tablette"</string> + <string name="permgroupdesc_personalInfo" product="default" msgid="5488050357388806068">"Accéder directement aux contacts et à l\'agenda enregistrés sur votre téléphone"</string> <string name="permgrouplab_location" msgid="635149742436692049">"Votre position"</string> <string name="permgroupdesc_location" msgid="2430258821648348660">"Suivre votre position géographique"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Communications réseau"</string> @@ -177,7 +177,7 @@ <string name="permgroupdesc_developmentTools" msgid="9056431193893809814">"Ces fonctionnalités sont réservées aux développeurs d\'applications."</string> <string name="permgrouplab_storage" msgid="1971118770546336966">"Stockage"</string> <string name="permgroupdesc_storage" product="nosdcard" msgid="7442318502446874999">"Accéder à la mémoire de stockage USB"</string> - <string name="permgroupdesc_storage" product="default" msgid="9203302214915355774">"Accès à la carte SD"</string> + <string name="permgroupdesc_storage" product="default" msgid="9203302214915355774">"Accéder à la carte SD"</string> <string name="permlab_statusBar" msgid="7417192629601890791">"Désactivation ou modification de la barre d\'état"</string> <string name="permdesc_statusBar" msgid="1365473595331989732">"Permet à une application de désactiver la barre d\'état ou d\'ajouter/supprimer des icônes système."</string> <string name="permlab_statusBarService" msgid="7247281911387931485">"barre d\'état"</string> @@ -193,7 +193,7 @@ <string name="permlab_sendSms" msgid="5600830612147671529">"Envoi de messages SMS"</string> <string name="permdesc_sendSms" msgid="1946540351763502120">"Permet aux applications d\'envoyer des messages SMS. Des applications malveillantes peuvent entraîner des frais en envoyant des messages sans vous en demander la confirmation."</string> <string name="permlab_readSms" msgid="4085333708122372256">"Lecture des SMS ou MMS"</string> - <string name="permdesc_readSms" product="tablet" msgid="5836710350295631545">"Permet à l\'application de lire les SMS stockés dans la mémoire de votre tablette ou sur votre carte SIM. Des applications malveillantes peuvent lire vos messages confidentiels."</string> + <string name="permdesc_readSms" product="tablet" msgid="5836710350295631545">"Permet à l\'application de lire les SMS enregistrés dans la mémoire de votre tablette ou sur votre carte SIM. Des applications malveillantes peuvent lire vos messages confidentiels."</string> <string name="permdesc_readSms" product="default" msgid="3002170087197294591">"Permet à l\'application de lire les SMS enregistrés dans la mémoire de votre téléphone ou sur votre carte SIM. Des applications malveillantes peuvent lire vos messages confidentiels."</string> <string name="permlab_writeSms" msgid="6881122575154940744">"Modification de SMS ou de MMS"</string> <string name="permdesc_writeSms" product="tablet" msgid="5332124772918835437">"Permet à une application de modifier des messages SMS stockés sur votre tablette ou sur votre carte SIM. Des applications malveillantes peuvent ainsi supprimer vos messages."</string> @@ -258,7 +258,7 @@ <string name="permlab_bindRemoteViews" msgid="5697987759897367099">"associer à un service widget"</string> <string name="permdesc_bindRemoteViews" msgid="2930855984822926963">"Permet à l\'application autorisée de s\'associer à l\'interface de plus haut niveau d\'un service widget. Les applications standard ne doivent jamais avoir recours à cette fonctionnalité."</string> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interagir avec l\'administrateur du périphérique"</string> - <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Permet à l\'application d\'envoyer des intentions à l\'administrateur du périphérique. Les applications standard ne devraient jamais avoir recours à cette fonctionnalité."</string> + <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Permet à l\'application d\'envoyer des intentions à l\'administrateur de l\'appareil. Les applications standard ne devraient jamais avoir recours à cette fonctionnalité."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"Changement d\'orientation de l\'écran"</string> <string name="permdesc_setOrientation" msgid="6335814461615851863">"Permet à une application de modifier la rotation de l\'écran à tout moment. Les applications normales ne devraient jamais avoir recours à cette fonctionnalité."</string> <string name="permlab_signalPersistentProcesses" msgid="4255467255488653854">"Envoi de signaux Linux aux applications"</string> @@ -309,10 +309,10 @@ <string name="permdesc_writeContacts" product="tablet" msgid="7782689510038568495">"Permet à une application de modifier les données (adresses) associées à vos contacts et stockées sur votre tablette. Des applications malveillantes peuvent utiliser cette fonctionnalité pour effacer ou modifier les données de vos contacts."</string> <string name="permdesc_writeContacts" product="default" msgid="3924383579108183601">"Permet à une application de modifier toutes les données de contact (adresses) enregistrées sur le téléphone. Des applications malveillantes peuvent utiliser cette fonctionnalité pour effacer ou modifier vos données de contact."</string> <string name="permlab_readCalendar" msgid="6898987798303840534">"lire des événements de l\'agenda"</string> - <string name="permdesc_readCalendar" product="tablet" msgid="5905870265734599678">"Permet à une application de lire tous les événements d\'agenda stockés sur votre tablette. Des applications malveillantes peuvent exploiter cette fonctionnalité pour envoyer les événements de votre agenda à d\'autres personnes."</string> - <string name="permdesc_readCalendar" product="default" msgid="5533029139652095734">"Permet à une application de lire tous les événements de l\'agenda enregistrés sur votre téléphone. Des applications malveillantes peuvent utiliser cette fonctionnalité pour envoyer les événements de votre agenda à d\'autres personnes."</string> + <string name="permdesc_readCalendar" product="tablet" msgid="5905870265734599678">"Permet à une application de lire tous les événements de l\'agenda enregistrés sur votre tablette. Des applications malveillantes peuvent exploiter cette fonctionnalité pour envoyer les événements de votre agenda à d\'autres personnes."</string> + <string name="permdesc_readCalendar" product="default" msgid="5533029139652095734">"Permet à une application de lire tous les événements de l\'agenda enregistrés sur votre téléphone. Des applications malveillantes peuvent exploiter cette fonctionnalité pour envoyer les événements de votre agenda à d\'autres personnes."</string> <string name="permlab_writeCalendar" msgid="3894879352594904361">"ajouter ou modifier des événements d\'agenda et envoyer des e-mails aux invités"</string> - <string name="permdesc_writeCalendar" msgid="2988871373544154221">"Autorise les applications à ajouter ou à modifier des événements dans votre agenda, qui pourra envoyer des e-mails aux invités. Des logiciels malveillants peuvent utiliser cette fonctionnalité pour supprimer ou modifier des événements de l\'agenda ou envoyer des e-mails aux invités."</string> + <string name="permdesc_writeCalendar" msgid="2988871373544154221">"Permet aux applications d\'ajouter ou de modifier des événements dans votre agenda, qui est susceptible d\'envoyer des e-mails aux invités. Des applications malveillantes peuvent exploiter cette fonctionnalité pour supprimer ou modifier des événements de l\'agenda ou envoyer des e-mails aux invités."</string> <string name="permlab_accessMockLocation" msgid="8688334974036823330">"Création de sources de localisation fictives à des fins de test"</string> <string name="permdesc_accessMockLocation" msgid="7648286063459727252">"Permet de créer des sources de localisation fictives à des fins de test. Des applications malveillantes peuvent utiliser cette fonctionnalité pour remplacer la position géographique et/ou l\'état fournis par des sources réelles comme le GPS ou les fournisseurs d\'accès."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"Accès aux commandes de fournisseur de position géographique supplémentaires"</string> @@ -321,10 +321,10 @@ <string name="permdesc_installLocationProvider" msgid="5449175116732002106">"Créer des sources de données de localisation factices à des fins de test. Les applications malveillantes peuvent exploiter cette fonction pour remplacer la position géographique et/ou l\'état renvoyé par les sources de données de localisation réelles, telles que le GPS ou les fournisseurs réseau, ou pour surveiller et transmettre votre position géographique à une source externe."</string> <string name="permlab_accessFineLocation" msgid="8116127007541369477">"Localisation OK (GPS)"</string> <string name="permdesc_accessFineLocation" product="tablet" msgid="243973693233359681">"Permet d\'accéder à des sources de localisation précises telles que le système GPS de la tablette, lorsque ces services sont disponibles. Des applications malveillantes peuvent exploiter cette fonctionnalité pour déterminer votre position, ce qui peut entraîner une utilisation accrue de la batterie."</string> - <string name="permdesc_accessFineLocation" product="default" msgid="7411213317434337331">"Permet d\'accéder à des sources de localisation précises comme le Global Positioning System (GPS) sur le téléphone, lorsque ces services sont disponibles. Des applications malveillantes peuvent utiliser cette fonctionnalité pour déterminer l\'endroit où vous vous trouvez et augmenter la consommation de la batterie de votre téléphone."</string> + <string name="permdesc_accessFineLocation" product="default" msgid="7411213317434337331">"Permet d\'accéder à des sources de localisation précises telles que le système GPS du téléphone, lorsque ces services sont disponibles. Des applications malveillantes peuvent exploiter cette fonctionnalité pour déterminer votre position, ce qui peut entraîner une utilisation accrue de la batterie."</string> <string name="permlab_accessCoarseLocation" msgid="4642255009181975828">"Position géo. approximative (selon le réseau)"</string> <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3704633168985466045">"Permet d\'accéder à des sources de localisation approximatives telles que des bases de données de réseaux mobiles pour déterminer la position géographique de la tablette lorsque celle-ci est disponible. Des applications malveillantes peuvent exploiter cette fonctionnalité pour déterminer votre position approximative."</string> - <string name="permdesc_accessCoarseLocation" product="default" msgid="8235655958070862293">"Accès à des sources de localisation approximative (par ex. des bases de données de réseaux mobiles) pour déterminer la position géographique du téléphone, lorsque cette option est disponible. Des applications malveillantes peuvent utiliser cette fonctionnalité pour déterminer approximativement l\'endroit où vous vous trouvez."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="8235655958070862293">"Permet d\'accéder à des sources de localisation approximatives telles que des bases de données de réseaux mobiles pour déterminer la position géographique du téléphone, lorsque cette option est disponible. Des applications malveillantes peuvent exploiter cette fonctionnalité pour déterminer votre position approximative."</string> <string name="permlab_accessSurfaceFlinger" msgid="2363969641792388947">"Accès à SurfaceFlinger"</string> <string name="permdesc_accessSurfaceFlinger" msgid="6805241830020733025">"Permet à certaines applications d\'utiliser les fonctionnalités SurfaceFlinger de bas niveau."</string> <string name="permlab_readFrameBuffer" msgid="6690504248178498136">"Lecture de la mémoire tampon graphique"</string> @@ -336,33 +336,35 @@ <string name="permlab_camera" msgid="3616391919559751192">"prendre des photos et enregistrer des vidéos"</string> <string name="permdesc_camera" msgid="6004878235852154239">"Permet de prendre des photos et d\'enregistrer des vidéos avec l\'appareil photo. Cette fonctionnalité permet à l\'application de récupérer à tout moment les images perçues par l\'appareil."</string> <string name="permlab_brick" product="tablet" msgid="2961292205764488304">"désactiver définitivement la tablette"</string> - <string name="permlab_brick" product="default" msgid="8337817093326370537">"Désactivation définitive du téléphone"</string> + <string name="permlab_brick" product="default" msgid="8337817093326370537">"désactiver définitivement le téléphone"</string> <string name="permdesc_brick" product="tablet" msgid="7379164636920817963">"Permet à l\'application de désactiver définitivement la tablette. Cette fonctionnalité est très dangereuse."</string> <string name="permdesc_brick" product="default" msgid="5569526552607599221">"Permet à l\'application de désactiver définitivement le téléphone. Cette fonctionnalité est très dangereuse."</string> <string name="permlab_reboot" product="tablet" msgid="3436634972561795002">"forcer le redémarrage de la tablette"</string> - <string name="permlab_reboot" product="default" msgid="2898560872462638242">"Redémarrage forcé du téléphone"</string> + <string name="permlab_reboot" product="default" msgid="2898560872462638242">"forcer le redémarrage du téléphone"</string> <string name="permdesc_reboot" product="tablet" msgid="4555793623560701557">"Permet à l\'application de forcer le redémarrage de la tablette."</string> <string name="permdesc_reboot" product="default" msgid="7914933292815491782">"Permet à l\'application de forcer le redémarrage du téléphone."</string> - <string name="permlab_mount_unmount_filesystems" msgid="1761023272170956541">"Monter et démonter des systèmes de fichiers"</string> - <string name="permdesc_mount_unmount_filesystems" msgid="6253263792535859767">"Permet à l\'application de monter et démonter des systèmes de fichiers pour des périphériques de stockage amovibles."</string> + <string name="permlab_mount_unmount_filesystems" msgid="1761023272170956541">"Installer et désinstaller des systèmes de fichiers"</string> + <string name="permdesc_mount_unmount_filesystems" msgid="6253263792535859767">"Permet à l\'application d\'installer et de désinstaller des systèmes de fichiers pour des périphériques de stockage amovibles."</string> <string name="permlab_mount_format_filesystems" msgid="5523285143576718981">"Formatage du périphérique de stockage externe"</string> <string name="permdesc_mount_format_filesystems" msgid="574060044906047386">"Permet à l\'application de formater le périphérique de stockage amovible."</string> <string name="permlab_asec_access" msgid="3411338632002193846">"obtenir des informations sur la mémoire de stockage interne"</string> - <string name="permdesc_asec_access" msgid="8820326551687285439">"Permet à l\'application d\'obtenir des informations sur le stockage interne."</string> - <string name="permlab_asec_create" msgid="6414757234789336327">"créer un stockage interne"</string> + <string name="permdesc_asec_access" msgid="8820326551687285439">"Permet à l\'application d\'obtenir des informations sur la mémoire de stockage interne."</string> + <string name="permlab_asec_create" msgid="6414757234789336327">"créer une mémoire de stockage interne"</string> <string name="permdesc_asec_create" msgid="2621346764995731250">"Permet à l\'application de créer une mémoire de stockage interne."</string> <string name="permlab_asec_destroy" msgid="526928328301618022">"détruire la mémoire de stockage interne"</string> - <string name="permdesc_asec_destroy" msgid="2746706889208066256">"Permet à l\'application de détruire le stockage interne."</string> + <string name="permdesc_asec_destroy" msgid="2746706889208066256">"Permet à l\'application de détruire la mémoire de stockage interne."</string> <string name="permlab_asec_mount_unmount" msgid="2456287623689029744">"installer/désinstaller la mémoire de stockage interne"</string> <string name="permdesc_asec_mount_unmount" msgid="5934375590189368200">"Permet l\'installation ou la désinstallation de la mémoire de stockage interne par l\'application."</string> <string name="permlab_asec_rename" msgid="7496633954080472417">"renommer la mémoire de stockage interne"</string> - <string name="permdesc_asec_rename" msgid="2152829985238876790">"Permet à l\'application de renommer le stockage interne."</string> + <string name="permdesc_asec_rename" msgid="2152829985238876790">"Permet à l\'application de renommer la mémoire de stockage interne."</string> <string name="permlab_vibrate" msgid="7768356019980849603">"Contrôle du vibreur"</string> <string name="permdesc_vibrate" msgid="2886677177257789187">"Permet à l\'application de contrôler le vibreur."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"Contrôle de la lampe de poche"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Permet à l\'application de contrôler la lampe de poche."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"accéder aux périphériques USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Autorise l\'application à accéder aux périphériques USB"</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"mettre en œuvre le protocole MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Permet l\'accès au pilote MTP du noyau à des fins de mise en œuvre du protocole USB MTP."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"Tests du matériel"</string> @@ -385,16 +387,16 @@ <string name="permlab_readPhoneState" msgid="2326172951448691631">"Lire l\'état et l\'identité du téléphone"</string> <string name="permdesc_readPhoneState" msgid="188877305147626781">"Permet à l\'application d\'accéder aux fonctionnalités d\'appel du téléphone. L\'application peut alors déterminer le numéro de téléphone et le numéro de série de l\'appareil, savoir si un appel est en cours, identifier le numéro appelé, etc."</string> <string name="permlab_wakeLock" product="tablet" msgid="1531731435011495015">"empêcher la tablette de passer en mode veille"</string> - <string name="permlab_wakeLock" product="default" msgid="573480187941496130">"Arrêt du mode veille sur le téléphone"</string> - <string name="permdesc_wakeLock" product="tablet" msgid="4032181488045338551">"Permet à une application d\'empêcher votre tablette de passer en mode veille."</string> - <string name="permdesc_wakeLock" product="default" msgid="7584036471227467099">"Permet à une application d\'empêcher votre téléphone de passer en mode veille."</string> + <string name="permlab_wakeLock" product="default" msgid="573480187941496130">"empêcher le téléphone de passer en mode veille"</string> + <string name="permdesc_wakeLock" product="tablet" msgid="4032181488045338551">"Permet à une application d\'empêcher la tablette de passer en mode veille."</string> + <string name="permdesc_wakeLock" product="default" msgid="7584036471227467099">"Permet à une application d\'empêcher le téléphone de passer en mode veille."</string> <string name="permlab_devicePower" product="tablet" msgid="2787034722616350417">"éteindre ou allumer la tablette"</string> <string name="permlab_devicePower" product="default" msgid="4928622470980943206">"Éteindre ou allumer le téléphone"</string> <string name="permdesc_devicePower" product="tablet" msgid="3853773100100451905">"Permet à l\'application d\'éteindre et d\'allumer la tablette."</string> <string name="permdesc_devicePower" product="default" msgid="4577331933252444818">"Permet à l\'application d\'éteindre et d\'allumer le téléphone."</string> <string name="permlab_factoryTest" msgid="3715225492696416187">"Exécution en mode Test d\'usine"</string> <string name="permdesc_factoryTest" product="tablet" msgid="3952059318359653091">"Permet d\'exécuter une application en mode test fabricant de faible niveau, autorisant ainsi l\'accès complet à la tablette. Cette fonctionnalité est uniquement disponible lorsque la tablette est en mode test fabricant."</string> - <string name="permdesc_factoryTest" product="default" msgid="8136644990319244802">"Permet d\'exécuter en tant que test fabricant de faible niveau en autorisant l\'accès au matériel du téléphone. Cette fonctionnalité est uniquement disponible lorsque le téléphone est en mode de test fabricant."</string> + <string name="permdesc_factoryTest" product="default" msgid="8136644990319244802">"Permet d\'exécuter une application en mode test fabricant de faible niveau en autorisant ainsi l\'accès au téléphone. Cette fonctionnalité est uniquement disponible lorsque le téléphone est en mode test fabricant."</string> <string name="permlab_setWallpaper" msgid="6627192333373465143">"Configuration du fond d\'écran"</string> <string name="permdesc_setWallpaper" msgid="6417041752170585837">"Permet à une application de définir le fond d\'écran du système."</string> <string name="permlab_setWallpaperHints" msgid="3600721069353106851">"Sélection de la la taille du fond d\'écran"</string> @@ -437,13 +439,13 @@ <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"autoriser la réception de données en Wi-Fi multidiffusion"</string> <string name="permdesc_changeWifiMulticastState" msgid="8199464507656067553">"Autorise une application à recevoir des paquets qui ne sont pas directement adressés à votre mobile. Cela peut être utile pour la recherche de services disponibles à proximité. Consomme plus que le mode non multidiffusion."</string> <string name="permlab_bluetoothAdmin" msgid="1092209628459341292">"Gestion Bluetooth"</string> - <string name="permdesc_bluetoothAdmin" product="tablet" msgid="3511795757324345837">"Permet à une application de configurer la tablette Bluetooth locale, de trouver des périphériques distants et de les associer à la tablette."</string> + <string name="permdesc_bluetoothAdmin" product="tablet" msgid="3511795757324345837">"Permet à une application de configurer la tablette Bluetooth locale, d\'identifier des appareils distants et de les associer à la tablette."</string> <string name="permdesc_bluetoothAdmin" product="default" msgid="7256289774667054555">"Permet à une application de configurer le téléphone Bluetooth local, d\'identifier des périphériques distants et de les associer au téléphone."</string> <string name="permlab_bluetooth" msgid="8361038707857018732">"Création de connexions Bluetooth"</string> <string name="permdesc_bluetooth" product="tablet" msgid="4191941825910543803">"Permet à une application d\'obtenir la configuration de la tablette Bluetooth locale, de se connecter à des appareils associés et d\'accepter leur connexion."</string> - <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Permet à une application d\'obtenir la configuration du téléphone Bluetooth local et de créer et accepter des connexions à des appareils associés."</string> + <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Permet à une application d\'obtenir la configuration du téléphone Bluetooth local, de se connecter à des appareils associés et d\'accepter leur connexion."</string> <string name="permlab_nfc" msgid="4423351274757876953">"contrôler la communication en champ proche"</string> - <string name="permdesc_nfc" msgid="9171401851954407226">"Autorise une application à communiquer avec des tags, cartes et lecteurs prenant en charge la communication en champ proche (NFC)."</string> + <string name="permdesc_nfc" msgid="9171401851954407226">"Permet à une application de communiquer avec des tags, cartes et lecteurs prenant en charge la communication en champ proche (NFC)."</string> <string name="permlab_disableKeyguard" msgid="4977406164311535092">"Désactivation du verrouillage des touches"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Permet à une application de désactiver le verrouillage des touches et toute sécurité par mot de passe. Exemple : Votre téléphone désactive le verrouillage du clavier lorsque vous recevez un appel, puis le réactive lorsque vous raccrochez."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"Lecture des paramètres de synchronisation"</string> @@ -461,7 +463,7 @@ <string name="permlab_writeDictionary" msgid="6703109511836343341">"Enregistrement dans le dictionnaire défini par l\'utilisateur"</string> <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Permet à une application d\'enregistrer de nouveaux mots dans le dictionnaire personnel de l\'utilisateur."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="85430876310764752">"modifier/supprimer le contenu de la mémoire de stockage USB"</string> - <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"Modifier/supprimer le contenu de la carte SD"</string> + <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"modifier/supprimer le contenu de la carte SD"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Autorise une application à écrire sur la mémoire USB."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Autorise une application à écrire sur la carte SD."</string> <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"modif./suppr. contenu mémoire interne support"</string> @@ -474,18 +476,18 @@ <string name="policydesc_limitPassword" msgid="9083400080861728056">"Gérer le nombre et le type de caractères autorisés dans les mots de passe de déverrouillage de l\'écran"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Gérer les tentatives de déverrouillage de l\'écran"</string> <string name="policydesc_watchLogin" product="tablet" msgid="933601759466308092">"Surveiller le nombre de mots de passe incorrects saisis lors du déverrouillage de l\'écran et verrouiller la tablette ou effacer toutes ses données après un certain nombre de tentatives."</string> - <string name="policydesc_watchLogin" product="default" msgid="7227578260165172673">"Gérer le nombre de mots de passe incorrects saisis lors du déverrouillage de l\'écran et verrouiller le téléphone ou effacer toutes ses données après un certain nombre de tentatives"</string> + <string name="policydesc_watchLogin" product="default" msgid="7227578260165172673">"Surveiller le nombre de mots de passe incorrects saisis lors du déverrouillage de l\'écran et verrouiller le téléphone ou effacer toutes ses données après un certain nombre de tentatives"</string> <string name="policylab_resetPassword" msgid="2620077191242688955">"Modifier le mot de passe de déverrouillage de l\'écran"</string> <string name="policydesc_resetPassword" msgid="5391240616981297361">"Modifier le mot de passe de déverrouillage de l\'écran"</string> <string name="policylab_forceLock" msgid="2274085384704248431">"Verrouiller l\'écran"</string> <string name="policydesc_forceLock" msgid="5696964126226028442">"Gérer le mode et les conditions de verrouillage de l\'écran"</string> <string name="policylab_wipeData" msgid="3910545446758639713">"Effacer toutes les données"</string> - <string name="policydesc_wipeData" product="tablet" msgid="314455232799486222">"Effacer les données de la tablette sans avertissement, en réinitialisant la configuration usine"</string> - <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Effacer les données du téléphone sans avertissement, en restaurant les valeurs d\'usine"</string> + <string name="policydesc_wipeData" product="tablet" msgid="314455232799486222">"Effacer les données de la tablette sans avertissement, en restaurant la configuration usine"</string> + <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Effacer les données du téléphone sans avertissement, en restaurant la configuration usine"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Définir le proxy global du mobile"</string> - <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Indiquez le proxy global à utiliser pour ce mobile lorsque les règles sont activées. Seul l\'administrateur principal du mobile peut définir le proxy global utilisé."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Définir la date d\'expiration du mot de passe"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Définir la fréquence de changement du mot de passe de verrouillage d\'écran"</string> + <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Indiquer le proxy global à utiliser pour ce mobile lorsque les règles sont activées. Seul l\'administrateur principal du mobile peut définir le proxy global utilisé."</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Définir exp. mot passe verr."</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Contrôler la fréquence de modification du mot de passe de verrouillage de l\'écran"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Définir cryptage du stockage"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Exiger que les données d\'application stockées soient cryptées"</string> <string-array name="phoneTypes"> @@ -606,11 +608,11 @@ <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Saisissez le mot de passe pour procéder au déverrouillage."</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Saisissez le code PIN pour procéder au déverrouillage."</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Le code PIN est incorrect !"</string> - <string name="keyguard_label_text" msgid="861796461028298424">"Pour débloquer le clavier, appuyez sur \"Menu\" puis sur 0."</string> + <string name="keyguard_label_text" msgid="861796461028298424">"Pour déverrouiller le clavier, appuyez sur \"Menu\" puis sur 0."</string> <string name="emergency_call_dialog_number_for_display" msgid="696192103195090970">"Numéro d\'urgence"</string> <string name="lockscreen_carrier_default" msgid="8812714795156374435">"(Aucun service)"</string> <string name="lockscreen_screen_locked" msgid="7288443074806832904">"Écran verrouillé"</string> - <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"Appuyez sur \"Menu\" pour débloquer le téléphone ou appeler un numéro d\'urgence"</string> + <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"Appuyez sur \"Menu\" pour déverrouiller le téléphone ou appeler un numéro d\'urgence"</string> <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"Appuyez sur \"Menu\" pour déverrouiller le téléphone."</string> <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"Dessinez un schéma pour déverrouiller le téléphone"</string> <string name="lockscreen_emergency_call" msgid="5347633784401285225">"Appel d\'urgence"</string> @@ -635,8 +637,8 @@ <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="3514742106066877476">"Vous avez mal reproduit le schéma de déverrouillage <xliff:g id="NUMBER_0">%d</xliff:g> fois. "\n\n"Veuillez réessayer dans <xliff:g id="NUMBER_1">%d</xliff:g> secondes."</string> <string name="lockscreen_too_many_failed_password_attempts_dialog_message" msgid="4906034376425175381">"Vous avez saisi un mot de passe incorrect à <xliff:g id="NUMBER_0">%d</xliff:g> reprises. "\n\n"Veuillez réessayer dans <xliff:g id="NUMBER_1">%d</xliff:g> secondes."</string> <string name="lockscreen_too_many_failed_pin_attempts_dialog_message" msgid="6827749231465145590">"Vous avez saisi un code PIN incorrect à <xliff:g id="NUMBER_0">%d</xliff:g> reprises. "\n\n"Veuillez réessayer dans <xliff:g id="NUMBER_1">%d</xliff:g> secondes."</string> - <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="8687762517114904651">"Vous avez saisi un schéma de déverrouillage incorrect à <xliff:g id="NUMBER_0">%d</xliff:g> reprises. Si vous échouez encore <xliff:g id="NUMBER_1">%d</xliff:g> fois, vous devrez débloquer votre tablette à l\'aide de votre identifiant Google."\n\n" Veuillez réessayer dans <xliff:g id="NUMBER_2">%d</xliff:g> secondes."</string> - <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="3351013842320127827">"Vous avez mal saisi le schéma de déverrouillage <xliff:g id="NUMBER_0">%d</xliff:g> fois. Au bout de <xliff:g id="NUMBER_1">%d</xliff:g> tentatives supplémentaires, vous devrez débloquer votre téléphone à l\'aide de votre identifiant Google."\n\n"Merci de réessayer dans <xliff:g id="NUMBER_2">%d</xliff:g> secondes."</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="8687762517114904651">"Vous avez saisi un schéma de déverrouillage incorrect à <xliff:g id="NUMBER_0">%d</xliff:g> reprises. Si vous échouez encore <xliff:g id="NUMBER_1">%d</xliff:g> fois, vous devrez déverrouiller votre tablette à l\'aide de votre identifiant Google."\n\n" Veuillez réessayer dans <xliff:g id="NUMBER_2">%d</xliff:g> secondes."</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="3351013842320127827">"Vous avez mal saisi le schéma de déverrouillage <xliff:g id="NUMBER_0">%d</xliff:g> fois. Au bout de <xliff:g id="NUMBER_1">%d</xliff:g> tentatives supplémentaires, vous devrez déverrouiller votre téléphone à l\'aide de votre identifiant Google."\n\n"Merci de réessayer dans <xliff:g id="NUMBER_2">%d</xliff:g> secondes."</string> <string name="lockscreen_too_many_failed_attempts_countdown" msgid="6251480343394389665">"Réessayez dans <xliff:g id="NUMBER">%d</xliff:g> secondes."</string> <string name="lockscreen_forgot_pattern_button_text" msgid="2626999449610695930">"Schéma oublié ?"</string> <string name="lockscreen_glogin_forgot_pattern" msgid="2588521501166032747">"Déverrouillage du compte"</string> @@ -648,7 +650,7 @@ <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Nom d\'utilisateur ou mot de passe incorrect."</string> <string name="lockscreen_glogin_account_recovery_hint" msgid="8253152905532900548">"Vous avez oublié votre nom d\'utilisateur ou votre mot de passe ?"\n"Accédez à la page "<b>"google.com/accounts/recovery"</b></string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Vérification..."</string> - <string name="lockscreen_unlock_label" msgid="737440483220667054">"Débloquer"</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Déverrouiller"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Son activé"</string> <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Son désactivé"</string> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> @@ -674,8 +676,8 @@ <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"lire l\'historique et les favoris du navigateur"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Autorise l\'application à lire toutes les URL auxquelles le navigateur a accédé et tous ses favoris."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"écrire dans l\'historique et les favoris du navigateur"</string> - <string name="permdesc_writeHistoryBookmarks" product="tablet" msgid="7193514090469945307">"Permet à une application de modifier l\'historique du navigateur ou les favoris stockés sur votre tablette. Des applications malveillantes peuvent utiliser cette fonctionnalité pour effacer ou modifier les données de votre navigateur."</string> - <string name="permdesc_writeHistoryBookmarks" product="default" msgid="945571990357114950">"Autorise une application à modifier l\'historique du navigateur ou les favoris enregistrés sur votre téléphone. Des applications malveillantes peuvent utiliser cette fonction pour effacer ou modifier les données de votre navigateur."</string> + <string name="permdesc_writeHistoryBookmarks" product="tablet" msgid="7193514090469945307">"Permet à une application de modifier l\'historique du navigateur ou les favoris enregistrés sur votre tablette. Des applications malveillantes peuvent exploiter cette fonctionnalité pour effacer ou modifier les données de votre navigateur."</string> + <string name="permdesc_writeHistoryBookmarks" product="default" msgid="945571990357114950">"Permet à une application de modifier l\'historique du navigateur ou les favoris enregistrés sur votre téléphone. Des applications malveillantes peuvent exploiter cette fonction pour effacer ou modifier les données de votre navigateur."</string> <string name="permlab_setAlarm" msgid="5924401328803615165">"régler le réveil"</string> <string name="permdesc_setAlarm" msgid="5966966598149875082">"Permet à l\'application de définir une alarme dans un utilitaire faisant office de réveil. Certains réveils risquent ne pas prendre en charge cette fonctionnalité."</string> <string name="permlab_writeGeolocationPermissions" msgid="4715212655598275532">"Modifier les autorisations de géolocalisation du navigateur"</string> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Utiliser cette application par défaut pour cette action"</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Effacer les paramètres par défaut dans les Paramètres de page d\'accueil > Applications > Gérer les applications."</string> <string name="chooseActivity" msgid="1009246475582238425">"Sélectionner une action"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Aucune application ne peut effectuer cette action."</string> <string name="aerr_title" msgid="653922989522758100">"Désolé !"</string> <string name="aerr_application" msgid="4683614104336409186">"Fermeture soudaine de l\'application <xliff:g id="APPLICATION">%1$s</xliff:g> (du processus <xliff:g id="PROCESS">%2$s</xliff:g>). Merci de réessayer."</string> @@ -912,22 +916,22 @@ <string name="ext_media_checking_notification_message" msgid="8287319882926737053">"Recherche d\'erreurs"</string> <string name="ext_media_nofs_notification_title" product="nosdcard" msgid="7788040745686229307">"Mémoire de stockage USB vide"</string> <string name="ext_media_nofs_notification_title" product="default" msgid="780477838241212997">"Carte SD vide"</string> - <string name="ext_media_nofs_notification_message" product="nosdcard" msgid="8623130522556087311">"Le stockage USB est vide ou son système de fichiers n\'est pas pris en charge."</string> + <string name="ext_media_nofs_notification_message" product="nosdcard" msgid="8623130522556087311">"La mémoire de stockage USB est vide ou son système de fichiers n\'est pas pris en charge."</string> <string name="ext_media_nofs_notification_message" product="default" msgid="3817704088027829380">"La carte SD est vide ou son système de fichiers n\'est pas pris en charge."</string> - <string name="ext_media_unmountable_notification_title" product="nosdcard" msgid="2090046769532713563">"Stockage USB endommagé"</string> + <string name="ext_media_unmountable_notification_title" product="nosdcard" msgid="2090046769532713563">"Mémoire de stockage USB endommagée"</string> <string name="ext_media_unmountable_notification_title" product="default" msgid="6410723906019100189">"Carte SD endommagée"</string> <string name="ext_media_unmountable_notification_message" product="nosdcard" msgid="529021299294450667">"La mémoire de stockage USB est endommagée. Un reformatage est peut-être nécessaire."</string> <string name="ext_media_unmountable_notification_message" product="default" msgid="6902531775948238989">"La carte SD est endommagée. Vous devrez peut-être la reformater."</string> - <string name="ext_media_badremoval_notification_title" product="nosdcard" msgid="1661683031330951073">"Mémoire USB retirée inopinément"</string> + <string name="ext_media_badremoval_notification_title" product="nosdcard" msgid="1661683031330951073">"Mémoire de stockage USB retirée inopinément"</string> <string name="ext_media_badremoval_notification_title" product="default" msgid="6872152882604407837">"Carte SD retirée inopinément"</string> <string name="ext_media_badremoval_notification_message" product="nosdcard" msgid="4329848819865594241">"Désinstaller la mémoire de stockage USB avant de la retirer pour éviter toute perte de données."</string> - <string name="ext_media_badremoval_notification_message" product="default" msgid="7260183293747448241">"Désactiver la carte SD avant de la retirer pour éviter toute perte de données."</string> - <string name="ext_media_safe_unmount_notification_title" product="nosdcard" msgid="3967973893270360230">"Retirez la mémoire USB en toute sécurité."</string> + <string name="ext_media_badremoval_notification_message" product="default" msgid="7260183293747448241">"Désinstaller la carte SD avant de la retirer pour éviter toute perte de données."</string> + <string name="ext_media_safe_unmount_notification_title" product="nosdcard" msgid="3967973893270360230">"La mémoire de stockage USB peut être retirée en toute sécurité."</string> <string name="ext_media_safe_unmount_notification_title" product="default" msgid="6729801130790616200">"La carte SD peut être retirée en toute sécurité"</string> - <string name="ext_media_safe_unmount_notification_message" product="nosdcard" msgid="6142195361606493530">"La mémoire de stockage USB peut être retirée en toute sécurité."</string> + <string name="ext_media_safe_unmount_notification_message" product="nosdcard" msgid="6142195361606493530">"Vous pouvez retirer la mémoire de stockage USB en toute sécurité."</string> <string name="ext_media_safe_unmount_notification_message" product="default" msgid="568841278138377604">"Vous pouvez retirer la carte SD en toute sécurité."</string> <string name="ext_media_nomedia_notification_title" product="nosdcard" msgid="4486377230140227651">"Mémoire de stockage USB retirée"</string> - <string name="ext_media_nomedia_notification_title" product="default" msgid="8902518030404381318">"Carte SD manquante"</string> + <string name="ext_media_nomedia_notification_title" product="default" msgid="8902518030404381318">"Carte SD retirée"</string> <string name="ext_media_nomedia_notification_message" product="nosdcard" msgid="6921126162580574143">"Mémoire de stockage USB retirée. Insérez un nouveau support."</string> <string name="ext_media_nomedia_notification_message" product="default" msgid="3870120652983659641">"La carte SD a été retirée. Insérez-en une autre."</string> <string name="activity_list_empty" msgid="4168820609403385789">"Aucune activité correspondante trouvée"</string> @@ -988,7 +992,7 @@ <string name="action_mode_done" msgid="7217581640461922289">"OK"</string> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"Désinstallation de la mémoire de stockage USB..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"Désinstallation de la carte SD..."</string> - <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"Effacement de la mémoire de stockage USB..."</string> + <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"Effacement de la mémoire de stockage USB..."</string> <string name="progress_erasing" product="default" msgid="2115214724367534095">"Effacement de la carte SD..."</string> <string name="format_error" product="nosdcard" msgid="4320339096529911637">"Impossible d\'effacer la mémoire de stockage USB"</string> <string name="format_error" product="default" msgid="1343380371925238343">"Impossible d\'effacer la carte SD"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 2fd6d19..860bec9 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Aplikaciji omogućuje nadzor nad vibracijom."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"nadzor bljeskalice"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Aplikaciji omogućuje nadzor nad bljeskalicom."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"pristupi USB uređajima"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Omogućuje aplikaciji pristup USB uređajima."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"Primjena MTP protokola"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Omogućuje pristup upravljačkom programu jezgre MTP-a radi implementacije MTP USB protokola."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"testiranje hardvera"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Izbriši podatke telefona bez upozorenja vraćanjem u tvorničko stanje"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"postavi globalni proxy uređaja"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Postavi globalni proxy uređaja za upotrebu dok su pravila omogućena. Samo prvi administrator uređaja postavlja djelotvoran globalni proxy."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Postavi istek zaporke"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Nadzirite za koliko vremena zaporka za zaključani zaslon treba biti promijenjena"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Post. istek zap. zaklj. zasl."</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Nadzirite koliko se često mora mijenjati zaporka za zaključavanje zaslona"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Postavi enkripciju za pohranu"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Zahtijevaj da pohranjeni podaci aplikacije budu kriptirani"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Koristi se kao zadana postavka za ovu lokaciju."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Izbrišite zadane postavke u izborniku Početne postavke > Aplikacije > Upravljanje aplikacijama."</string> <string name="chooseActivity" msgid="1009246475582238425">"Odaberite radnju"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Tu radnju ne može izvesti nijedna aplikacija."</string> <string name="aerr_title" msgid="653922989522758100">"Žao nam je."</string> <string name="aerr_application" msgid="4683614104336409186">"Aplikacija <xliff:g id="APPLICATION">%1$s</xliff:g> (postupak <xliff:g id="PROCESS">%2$s</xliff:g>) neočekivano je zaustavljen. Pokušajte ponovo."</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index aa4af42..f962f35 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Lehetővé teszi az alkalmazás számára a rezgés vezérlését."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"vaku vezérlése"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Lehetővé teszi az alkalmazás számára a vaku vezérlését."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"USB-eszközök elérése"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Lehetővé teszi az alkalmazások számára az USB-eszközök elérését."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"MTP-protokoll megvalósítása"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Hozzáférést biztosít a kernel MTP illesztőprogramjához az MTP USB-protokoll megvalósításának céljából."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"hardver tesztelése"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Figyelmeztetés nélkül törli a telefon összes adatát, visszaállítva a gyári adatokat"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Az eszköz globális proxyjának beállítása"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Az eszköz globális proxyja lesz használatban, amíg az irányelv engedélyezve van. Csak az eszköz első rendszergazdája állíthatja be a tényleges globális proxyt."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Jelszó lejáratának beállítása"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Azt vezérli, mennyi időnként kell módosítani a képernyőt zároló jelszót"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Képernyőjelszó érvényessége"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Adja meg, hogy milyen gyakran kell módosítani a képernyőzár jelszavát"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Tárhelytitkosítás beállítása"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Megköveteli a tárolt alkalmazásadatok titkosítását"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Ez legyen az alapértelmezett program ehhez a művelethez."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Az alapértelmezés törlése a Főoldal beállításai > Alkalmazások > Alkalmazások kezelése menüben lehetséges."</string> <string name="chooseActivity" msgid="1009246475582238425">"Válasszon műveletet"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Egyik alkalmazás sem tudja végrehajtani ezt a műveletet."</string> <string name="aerr_title" msgid="653922989522758100">"Sajnáljuk!"</string> <string name="aerr_application" msgid="4683614104336409186">"A(z) <xliff:g id="APPLICATION">%1$s</xliff:g> alkalmazás <xliff:g id="PROCESS">%2$s</xliff:g> folyamata váratlanul leállt. Kérjük, próbálja újra."</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index eb14169..7b10651 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Mengizinkan aplikasi mengontrol penggetar."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"mengontrol lampu senter"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Mengizinkan aplikasi mengontrol lampu senter."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"akses perangkat USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Mengizinkan aplikasi untuk perangkat USB."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"implementasikan protokol MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Izinkan akses pada driver MTP kernel untuk mengimplementasikan protokol USB MTP."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"uji perangkat keras"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Hapus data ponsel tanpa peringatan, dengan menyetel ulang data pabrik"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Setel proxy global perangkat"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Setel proxy global perangkat yang akandigunakan ketika kebijakan diaktifkan. Hanya admin perangkat pertama yang menyetel procy global yang berlaku."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Setel waktu kedaluwarsa sandi"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Kontrol berapa lama sebelum sandi penguncian layar perlu diubah"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Setel kedaluwarsa sandi pengunci layar"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Kontrol seberapa sering sandi pengunci layar harus diganti"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Setel enkripsi penyimpanan"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Mengharuskan data aplikasi yang disimpan untuk dienkripsi"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Gunakan secara bawaan untuk tindakan ini."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Bersihkan bawaan pada Setelan Beranda > Aplikasi > Kelola aplikasi."</string> <string name="chooseActivity" msgid="1009246475582238425">"Pilih tindakan"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Tidak ada aplikasi dapat melakukan tindakan ini."</string> <string name="aerr_title" msgid="653922989522758100">"Maaf!"</string> <string name="aerr_application" msgid="4683614104336409186">"<xliff:g id="APPLICATION">%1$s</xliff:g> aplikasi (<xliff:g id="PROCESS">%2$s</xliff:g> proses) berhenti tiba-tiba. Harap coba lagi."</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 1507467..76b6d1d 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Consente all\'applicazione di controllare la vibrazione."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"controllo flash"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Consente all\'applicazione di controllare il flash."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"accesso a dispositivi USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Consente all\'applicazione di accedere ai dispositivi USB"</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"implementa protocollo MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Consente di accedere al driver MTP del kernel per implementare il protocollo USB MTP."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"esecuzione test hardware"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Cancella i dati del telefono senza preavviso eseguendo un ripristino dati di fabbrica"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Imposta il proxy globale del dispositivo"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Imposta il proxy globale del dispositivo in modo da utilizzarlo mentre la norma è attiva. Il proxy globale effettivo è impostabile solo dal primo amministratore del dispositivo."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Imposta scadenza password"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Stabilisci la scadenza della password di blocco dello schermo"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Imposta scadenza password blocco schermo"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Stabilisci la frequenza di modifica della password di blocco dello schermo"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Imposta crittografia archivio"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Richiede la crittografia dei dati applicazione memorizzati"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Usa come predefinita per questa azione."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Cancella predefinita in Home > Impostazioni > Applicazioni > Gestisci applicazioni."</string> <string name="chooseActivity" msgid="1009246475582238425">"Seleziona un\'azione"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Nessuna applicazione è in grado di svolgere questa azione."</string> <string name="aerr_title" msgid="653922989522758100">"Spiacenti."</string> <string name="aerr_application" msgid="4683614104336409186">"Interruzione imprevista dell\'applicazione <xliff:g id="APPLICATION">%1$s</xliff:g> (processo <xliff:g id="PROCESS">%2$s</xliff:g>). Riprova."</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 7aa7b30..1b597c8 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"מאפשר ליישום לשלוט ברטט."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"שליטה בפנס"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"מאפשר ליישום לשלוט בפנס."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"גישה להתקני USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"מאפשר ליישום גישה להתקני USB."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"יישם פרוטוקול MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"מאפשר גישה למנהל התקן MTP של הליבה כדי ליישם פרוטוקול USB של MTP."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"בדוק חומרה"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"מחק את נתוני הטלפון ללא אזהרה, על ידי ביצוע איפוס נתוני יצרן"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"הגדר את שרת ה-proxy הגלובלי של ההתקן"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"הגדר את שרת proxy הגלובלי של ההתקן לשימוש כאשר המדיניות מופעלת. רק מנהל ההתקן הראשון מגדיר את שרת ה-proxy הגלובלי הפעיל."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"הגדר תפוגת תוקף של סיסמה"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"שלוט בפרק הזמן הדרוש לשינוי הסיסמה של נעילת המסך"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"הגדר תאריך תפוגה לסיסמה של נעילת המסך"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"שלוט בתדירות שבה הסיסמה של נעילת המסך חייבת להשתנות"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"הגדר הצפנת אחסון"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"דורש שנתוני היישום המאוחסנים יהיו מוצפנים"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"השתמש כברירת מחדל עבור פעולה זו."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"נקה את ברירת המחדל ב\'הגדרות דף הבית\' > \'יישומים\' > \'נהל יישומים\'."</string> <string name="chooseActivity" msgid="1009246475582238425">"בחר פעולה"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"אין יישומים שיכולים לבצע פעולה זו."</string> <string name="aerr_title" msgid="653922989522758100">"מצטערים!"</string> <string name="aerr_application" msgid="4683614104336409186">"היישום <xliff:g id="APPLICATION">%1$s</xliff:g> (תהליך <xliff:g id="PROCESS">%2$s</xliff:g>) הופסק באופן לא צפוי. נסה שוב."</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index af2e4d4..7594744 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"バイブレーションの制御をアプリケーションに許可します。"</string> <string name="permlab_flashlight" msgid="2155920810121984215">"ライトのコントロール"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"ライトの制御をアプリケーションに許可します。"</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"USBデバイスへのアクセス"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"USBデバイスへのアクセスをアプリケーションに許可します。"</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"MTPプロトコルの実装"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"カーネルMTPドライバにアクセスしてMTP USBプロトコルを実装することを許可します。"</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"ハードウェアのテスト"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"警告せずにデータの初期化を実行して端末内のデータを消去します。"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"端末のグローバルプロキシを設定"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"ポリシーが有効になっている場合は端末のグローバルプロキシが使用されるように設定します。有効なグローバルプロキシを設定できるのは最初のデバイス管理者だけです。"</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"パスワードの有効期限の設定"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"画面ロックパスワードの変更が必要になるまでの期間を指定します"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"解除パスワードの有効期限の設定"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"ロック解除パスワードの変更が必要になる頻度を指定します"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"ストレージ暗号化の設定"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"保存したアプリケーションデータが暗号化されるようにする"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"常にこの操作で使用する"</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"ホームの[設定]>[アプリケーション]>[アプリケーションの管理]でデフォルト設定をクリアします。"</string> <string name="chooseActivity" msgid="1009246475582238425">"操作の選択"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"この操作を実行できるアプリケーションはありません。"</string> <string name="aerr_title" msgid="653922989522758100">"エラー"</string> <string name="aerr_application" msgid="4683614104336409186">"<xliff:g id="APPLICATION">%1$s</xliff:g>（<xliff:g id="PROCESS">%2$s</xliff:g>）が予期せず停止しました。やり直してください。"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 6d1423c..a718344 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"애플리케이션이 진동을 제어할 수 있도록 합니다."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"카메라 플래시 제어"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"애플리케이션이 카메라 플래시를 제어할 수 있도록 합니다."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"USB 장치 액세스"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"애플리케이션이 USB 장치에 액세스하도록 허용합니다."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"MTP 프로토콜 구현"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"커널 MTP 드라이버에 액세스하여 MTP USB 프로토콜을 구현할 수 있도록 허용합니다."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"하드웨어 테스트"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"공장 초기화를 수행하여 경고 없이 휴대전화 데이터를 지웁니다."</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"기기 전체 프록시 설정"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"정책이 사용 설정되어 있는 동안 사용될 기기 전체 프록시를 설정합니다. 첫 번째 기기 관리자가 설정한 전체 프록시만 유효합니다."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"비밀번호 만료 설정"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"화면 잠금 비밀번호를 변경해야 하는 기간 변경"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"화면 잠금 비밀번호 만료 설정"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"화면 잠금 비밀번호 변경 빈도 설정"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"저장소 암호화 설정"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"저장한 애플리케이션 데이터를 암호화해야 합니다."</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"이 작업에 대해 기본값으로 사용"</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"홈 설정 > 애플리케이션 > 애플리케이션 관리에서 기본값을 지웁니다."</string> <string name="chooseActivity" msgid="1009246475582238425">"작업 선택"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"작업을 수행할 수 있는 애플리케이션이 없습니다."</string> <string name="aerr_title" msgid="653922989522758100">"죄송합니다."</string> <string name="aerr_application" msgid="4683614104336409186">"<xliff:g id="APPLICATION">%1$s</xliff:g> 애플리케이션(<xliff:g id="PROCESS">%2$s</xliff:g> 프로세스)이 예상치 않게 중지되었습니다. 다시 시도해 주세요."</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index b014815..2580af9 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Leidžia programai valdyti vibratorių."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"valdyti šviesos signalą"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Leidžia programai valdyti šviesos signalą."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"pasiekti USB įrenginius"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Leidžiama programai pasiekti USB įrenginius."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"taikyti MTP protokolą"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Leidžiama prieiga prie pagrindinės MTP tvarkyklės taikyti MTP USB protokolą."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"bandyti aparatinę įrangą"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Be įspėjimo ištrinti telefono duomenis iš naujo nustatant gamyklinius duomenis"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Nustatyti įrenginio bendrąjį tarpinį serverį"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Nustatyti įrenginio bendrąjį tarpinį serverį, kad būtų naudojamas, kol įgalinta politika. Tik pirmasis įrenginio administratorius nustato efektyvų bendrąjį tarpinį serverį."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Nustatyti slaptažodžio galiojimo pabaigą"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Valdyti, per kiek laiko iki ekrano užrakinimo turi būti pakeistas slaptažodis"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Nust. ekr. užr. slapt. gal. pab."</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Valdykite, kaip dažnai reikia keisti ekrano užrakto slaptažodį"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Nustatyti atmintinės šifruotę"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Saugomos programos duomenys turi būti šifruoti"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Šiam veiksmui tai naudoti pagal numatytuosius nustatymus."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Išvalykite numatytuosius nustatymus apsilankę „Pagrindiniai nustatymai“ > „Programos“ > „Valdyti programas“."</string> <string name="chooseActivity" msgid="1009246475582238425">"pasirinkti veiksmą"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Šio veiksmo negali atlikti jokios programos."</string> <string name="aerr_title" msgid="653922989522758100">"Apgailestaujame!"</string> <string name="aerr_application" msgid="4683614104336409186">"Programa <xliff:g id="APPLICATION">%1$s</xliff:g> (<xliff:g id="PROCESS">%2$s</xliff:g> procesas) netikėtai sustojo. Bandykite dar kartą."</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 3f69434..b7adf2d 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Ļauj lietojumprogrammai kontrolēt vibrozvanu."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"kontrolēt uzliesmojumu"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Ļauj lietojumprogrammai kontrolēt uzliesmojumu."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"piekļuve USB ierīcēm"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Ļauj lietojumprogrammai piekļūt USB ierīcēm."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"Ieviests MTP protokols"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Ļauj piekļūt kodola MTP dzinim, lai ieviestu MTP USB protokolu."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"pārbaudīt aparatūru"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Dzēš tālruņa datus bez brīdinājuma, veicot rūpnīcas datu atiestatīšanu"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Iestatīt ierīces globālo starpniekserveri"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Iestatiet izmantojamo ierīces globālo starpniekserveri, kad ir iespējota politika. Spēkā esošo globālo starpniekserveri iestata tikai pirmās ierīces administrators."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Paroles beigu termiņa iestatīšana"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Kontrolē ekrāna bloķēšanas paroles maiņas intervālu"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Ekr. bloķ. paroles term. iest."</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Kontrolē, cik bieži ir jāmaina ekrāna bloķēšanas parole."</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Skatīt atmiņas šifrējumu"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Pieprasīt, lai saglabātie lietojumprogrammas dati tiktu šifrēti"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Pēc noklusējuma izmantot šai darbībai."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Notīriet noklusējumu šeit: Sākuma iestatījumi > Lietojumprogrammas > Lietojumprogrammu pārvaldība."</string> <string name="chooseActivity" msgid="1009246475582238425">"Atlasiet darbību"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Šo darbību nevar veikt neviena lietojumprogramma."</string> <string name="aerr_title" msgid="653922989522758100">"Atvainojiet!"</string> <string name="aerr_application" msgid="4683614104336409186">"Lietojumprogrammas <xliff:g id="APPLICATION">%1$s</xliff:g> (process <xliff:g id="PROCESS">%2$s</xliff:g>) darbība neparedzēti tika apturēta. Lūdzu, mēģiniet vēlreiz."</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 09a2cd4..d3463fd 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Lar applikasjonen kontrollere vibratoren."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"kontrollere lommelykten"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Lar applikasjonen kontrollere lommelykten."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"tilgang til USB-enheter"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Tillater programmet å få tilgang til USB-enheter."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"implementer MTP-protokoll"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Tillater tilgang til kjerne-MTP-driver for implementering av MTP USB-protokollen."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"teste maskinvare"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Tilbakestill telefonens data uten advarsel ved å utføre tilbakestilling til fabrikkstandard"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Angi enhetens globale mellomtjener"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Angir den globale mellomtjeneren på enheten som skal brukes når regelen er aktivert. Kun den opprinnelige administratoren av enheten kan angi den globale mellomtjeneren."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Angi utløpsdato for passordet"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Velg hvor lenge det skal gå før passordet til låseskjermen må byttes"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Angi utløpsdato for skjermlåspassordet"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Velg hvor lenge det skal gå før passordet til skjermlåsen må byttes"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Angi lagringskryptering"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Krever at lagrede programdata krypteres"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Bruk som standardvalg."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Fjern standardvalg i Innstillinger > Applikasjoner > Installerte applikasjoner."</string> <string name="chooseActivity" msgid="1009246475582238425">"Velg en aktivitet"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Ingen applikasjoner kan gjøre dette."</string> <string name="aerr_title" msgid="653922989522758100">"Beklager!"</string> <string name="aerr_application" msgid="4683614104336409186">"Applikasjonen <xliff:g id="APPLICATION">%1$s</xliff:g> (prosess <xliff:g id="PROCESS">%2$s</xliff:g>) stoppet uventet. Prøv igjen."</string> @@ -920,7 +924,7 @@ <string name="ext_media_unmountable_notification_message" product="default" msgid="6902531775948238989">"Minnekortet er skadet. Du må kanskje formatere det."</string> <string name="ext_media_badremoval_notification_title" product="nosdcard" msgid="1661683031330951073">"USB-lagring fjernet uventet"</string> <string name="ext_media_badremoval_notification_title" product="default" msgid="6872152882604407837">"Minnekortet ble tatt ut uventet"</string> - <string name="ext_media_badremoval_notification_message" product="nosdcard" msgid="4329848819865594241">"Koble fra USB-lagring før enheten tas ut av maskinen for å unngå tap av data."</string> + <string name="ext_media_badremoval_notification_message" product="nosdcard" msgid="4329848819865594241">"Koble fra USB-enheten før du tar den ut for å unngå tap av data."</string> <string name="ext_media_badremoval_notification_message" product="default" msgid="7260183293747448241">"Avmonter minnekortet før det tas ut, for å unngå datatap."</string> <string name="ext_media_safe_unmount_notification_title" product="nosdcard" msgid="3967973893270360230">"USB-lagring kan trygt fjernes"</string> <string name="ext_media_safe_unmount_notification_title" product="default" msgid="6729801130790616200">"Trygt å ta ut minnekort"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 85a7a2d..68ab40c 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Hiermee kan de app de trilstand beheren."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"zaklamp bedienen"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Hiermee kan de app de zaklamp bedienen."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"toegang krijgen tot USB-apparaten"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Hiermee kan de app toegang krijgen tot USB-apparaten."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"MTP-protocol implementeren"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Staat toegang tot de kernel van de MTP-driver toe voor het implementeren van het MTP-USB-protocol."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"hardware testen"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"De gegevens van de telefoon zonder waarschuwing wissen door de fabrieksinstellingen te herstellen"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Algemene proxy voor het apparaat instellen"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Stel de algemene proxy voor het apparaat in die moet worden gebruikt terwijl het beleid is geactiveerd. Alleen de eerste apparaatbeheerder stelt de algemene proxy in."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Verval wachtwoord instellen"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Beheren hoe lang het duurt voordat het wachtwoord voor schermvergrendeling moet worden gewijzigd"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Verval wachtwoord instellen"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Beheren hoe vaak het wachtwoord voor schermvergrendeling moet worden gewijzigd"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Codering voor opslag instellen"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Vereisen dat opgeslagen toepassingsgegevens kunnen worden gecodeerd"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Standaard gebruiken voor deze actie."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Wis standaardinstelling via startscherm: \'Instellingen\' > \'Toepassingen\' > \'Toepassingen beheren\'."</string> <string name="chooseActivity" msgid="1009246475582238425">"Een actie selecteren"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Geen enkele app kan deze actie uitvoeren."</string> <string name="aerr_title" msgid="653922989522758100">"Helaas!"</string> <string name="aerr_application" msgid="4683614104336409186">"De app <xliff:g id="APPLICATION">%1$s</xliff:g> (proces <xliff:g id="PROCESS">%2$s</xliff:g>) is onverwachts gestopt. Probeer het opnieuw."</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 99f723c..4c5f062 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Pozwala aplikacjom na kontrolowanie wibracji."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"kontrolowanie latarki"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Pozwala aplikacji kontrolować latarkę."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"dostęp do urządzeń USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Zezwala aplikacji na dostęp do urządzeń USB."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"implementowanie protokołu MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Zezwala na dostęp do sterownika MTP jądra w celu implementacji protokołu USB MTP."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"testowanie sprzętu"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Wymazywanie danych z telefonu bez ostrzeżenia, przez przywrócenie danych fabrycznych"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Ustaw globalny serwer proxy urządzenia"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Ustaw globalny serwer proxy urządzenia do wykorzystywania przy włączonych zasadach. Tylko pierwszy administrator urządzenia ustawia obowiązujący globalny serwer proxy."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Ustaw wygasanie hasła"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Kontrola czasu, po którym należy zmienić hasło blokowania ekranu"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Ustaw wygasanie hasła blokady"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Kontrola częstości zmian hasła ekranu blokady"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Ustaw szyfrowanie pamięci"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Wymaga szyfrowania danych zapisanych aplikacji"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Używaj domyślnie dla tej czynności."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Wyczyść domyślne w: Ustawienia strony głównej > Aplikacje > Zarządzaj aplikacjami."</string> <string name="chooseActivity" msgid="1009246475582238425">"Wybierz czynność"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Żadna z aplikacji nie może wykonać tej czynności."</string> <string name="aerr_title" msgid="653922989522758100">"Przepraszamy!"</string> <string name="aerr_application" msgid="4683614104336409186">"Aplikacja <xliff:g id="APPLICATION">%1$s</xliff:g> (proces <xliff:g id="PROCESS">%2$s</xliff:g>) została niespodziewanie zatrzymana. Spróbuj ponownie."</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 9c069c4..014bf88 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Permite à aplicação controlar o vibrador."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"controlar lanterna"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Permite à aplicação controlar a lanterna."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"aceder a dispositivos USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Permite à aplicação aceder a dispositivos USB."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"implementar protocolo MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Permite o acesso ao controlador MTP de kernel para implementar o protocolo MTP USB."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"testar hardware"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Apagar os dados do telefone sem avisar, ao efectuar uma reposição de dados de fábrica"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Definir o proxy global do aparelho"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Definir o proxy global do aparelho a ser utilizado quando a política estiver activada. Só o primeiro administrador do aparelho define o proxy global efectivo."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Definir tempo de validade da palavra-passe"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Controle com que antecedência é necessário alterar a palavra-passe de bloqueio do ecrã"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Def. valid. palavra-passe bloq. ecrã"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Controlar a frequência com que a palavra-passe deve ser alterada"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Def. encriptação armazenamento"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Requerer encriptação dos dados da aplicação armazenados"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Utilizar por predefinição para esta acção."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Limpar predefinição em Definições iniciais > Aplicações > Gerir aplicações."</string> <string name="chooseActivity" msgid="1009246475582238425">"Seleccionar uma acção"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Nenhuma aplicação pode efectuar esta acção."</string> <string name="aerr_title" msgid="653922989522758100">"Lamentamos."</string> <string name="aerr_application" msgid="4683614104336409186">"A aplicação <xliff:g id="APPLICATION">%1$s</xliff:g> (processo <xliff:g id="PROCESS">%2$s</xliff:g>) parou de forma inesperada. Tente novamente."</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index e8b230f..07907fb 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Permite que o aplicativo controle o vibrador."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"controlar lanterna"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Permite que o aplicativo controle a lanterna."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"acessar dispositivos USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Permitir que o aplicativo acesse dispositivos USB."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"implementar protocolo MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Permite acesso ao driver MTP do núcleo para implementar o protocolo USB MTP."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"testar hardware"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Apaga os dados do telefone sem aviso, executando uma redefinição da configuração original"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Definir o proxy global do dispositivo"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Configura o proxy global do dispositivo para ser usado enquanto a política estiver ativada. Somente o primeiro administrador do dispositivo pode configurar um verdadeiro proxy global."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Definir validade da senha"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Controle quanto tempo uma senha de bloqueio de tela deve ficar ativa antes de ser alterada"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Definir val. da senha de bloqueio"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Controlar a frequência com que a senha da tela de bloqueio deve ser alterada"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Definir criptografia de armazenamento"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Exigir que os dados do aplicativo armazenado sejam criptografados"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Usar como padrão para esta ação."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Limpar o padrão em Configurações da página inicial > Aplicativos > Gerenciar aplicativos."</string> <string name="chooseActivity" msgid="1009246475582238425">"Selecionar uma ação"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Nenhum aplicativo pode realizar esta ação."</string> <string name="aerr_title" msgid="653922989522758100">"Desculpe!"</string> <string name="aerr_application" msgid="4683614104336409186">"O aplicativo <xliff:g id="APPLICATION">%1$s</xliff:g> (processo <xliff:g id="PROCESS">%2$s</xliff:g>) parou inesperadamente. Tente novamente."</string> diff --git a/core/res/res/values-rm/strings.xml b/core/res/res/values-rm/strings.xml index f3073bd..bc1e133 100644 --- a/core/res/res/values-rm/strings.xml +++ b/core/res/res/values-rm/strings.xml @@ -367,8 +367,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Permetta a l\'applicaziun da controllar la vibraziun."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"controllar la glischina"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Permetta a l\'applicaziun da controllar la glischina."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"acceder ad apparats USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Permetta a l\'applicaziun dad acceder als apparats periferics USB."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <!-- no translation found for permlab_accessMtp (4953468676795917042) --> <skip /> <!-- no translation found for permdesc_accessMtp (6532961200486791570) --> @@ -865,6 +867,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Utilisar questa applicaziun sco standard per questa acziun."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Stizzar ils parameters da standard en Parameters da la pagina da partenza > Applicaziuns > Administrar las applicaziuns."</string> <string name="chooseActivity" msgid="1009246475582238425">"Tscherner ina acziun"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Nagina applicaziun po exequir questa acziun."</string> <string name="aerr_title" msgid="653922989522758100">"Perstgisai!"</string> <string name="aerr_application" msgid="4683614104336409186">"L\'applicaziun <xliff:g id="APPLICATION">%1$s</xliff:g> (process <xliff:g id="PROCESS">%2$s</xliff:g>) è vegnida serrada nunspetgadamain. Empruvai anc ina giada."</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 217c965..59fc5c9 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Permite aplicaţiei să controleze mecanismul de vibrare."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"control lanternă"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Permite aplicaţiei să controleze lanterna."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"accesare dispozitive USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Permite aplicaţiei să acceseze dispozitive USB."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"implementare protocol MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Permite accesul la driverul MTP al nucleului pentru a implementa protocolul USB pentru MTP."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"testare hardware"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Ştergeţi datele din telefon fără avertisment, efectuând resetarea configurării din fabrică"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Setaţi serverul proxy global pentru dispozitiv"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Setaţi serverul proxy global pentru dispozitiv care să fie utilizat cât timp politica este activă. Numai primul administrator al dispozitivului poate seta serverul proxy global activ."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Setaţi expirarea parolei"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Controlarea duratei până când parola de blocare a ecranului trebuie modificată"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Expirare parolă blocare ecran"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Stabiliţi frecvenţa de schimbare a parolei de blocare a ecranului"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Setaţi criptarea stocării"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Necesită ca datele aplicaţiei stocate să fie criptate"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Se utilizează în mod prestabilit pentru această acţiune."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Ştergeţi setările prestabilite din Setări pagină de pornire > Aplicaţii > Gestionare aplicaţii."</string> <string name="chooseActivity" msgid="1009246475582238425">"Selectaţi o acţiune"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Această acţiune nu poate fi efectuată de nicio aplicaţie."</string> <string name="aerr_title" msgid="653922989522758100">"Ne pare rău!"</string> <string name="aerr_application" msgid="4683614104336409186">"Aplicaţia <xliff:g id="APPLICATION">%1$s</xliff:g> (procesul <xliff:g id="PROCESS">%2$s</xliff:g>) s-a oprit în mod neaşteptat. Încercaţi din nou."</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 405fbc0..ff67961 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Позволяет приложению управлять виброзвонком."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"управлять вспышкой"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Позволяет приложению управлять вспышкой."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"доступ к USB-устройствам"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Позволяет приложению получать доступ к USB-устройствам."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"Реализовать протокол MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Разрешает доступ к драйверу основного устройства MTP для реализации протокола MTP USB"</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"проверять аппаратное обеспечение"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Уничтожить все данные на телефоне без предупреждения путем сброса настроек"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Глобальный прокси-сервер"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Настройте глобальный прокси-сервер устройства, который будет использоваться при активной политике. Глобальный прокси-сервер должен настроить первый администратор устройства."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Задать время действия пароля"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Задать время действия пароля перед появлением экрана блокировки"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Задать срок действия пароля"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Укажите, как часто следует менять пароль блокировки экрана"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Настроить шифрование хранилища"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Требует шифровать данные приложений, находящиеся в хранилище."</string> <string-array name="phoneTypes"> @@ -619,7 +621,7 @@ <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Повторите попытку"</string> <string name="lockscreen_password_wrong" msgid="6237443657358168819">"Повторите попытку"</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"Идет зарядка (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> - <string name="lockscreen_charged" msgid="4938930459620989972">"Заряжена."</string> + <string name="lockscreen_charged" msgid="4938930459620989972">"Батарея заряжена"</string> <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Подключите зарядное устройство."</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Нет SIM-карты."</string> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"По умолчанию для этого действия"</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Удалить настройки по умолчанию: главный экран > \"Настройки\" > \"Приложения\" > \"Управление приложениями\"."</string> <string name="chooseActivity" msgid="1009246475582238425">"Выберите действие"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Это действие не может выполнять ни одно приложение."</string> <string name="aerr_title" msgid="653922989522758100">"Ошибка приложения!"</string> <string name="aerr_application" msgid="4683614104336409186">"Произошла неожиданная остановка приложения <xliff:g id="APPLICATION">%1$s</xliff:g> (процесс <xliff:g id="PROCESS">%2$s</xliff:g>). Повторите попытку."</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 9605af2..5d10d27 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Umožňuje aplikácii ovládať vibrácie."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"ovládanie kontrolky"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Umožňuje aplikácii ovládať kontrolku."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"prístup k zariadeniam USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Umožní aplikácii prístup k zariadeniam USB."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"implementovať protokol MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Povoľuje prístup k ovládaču kernel MTP na implementáciu protokolu MTP USB."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"testovanie hardvéru"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Bez predchádzajúceho upozornenia zmazať všetky údaje tým, že sa obnovia továrenské nastavenia telefónu"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Nastaviť globálny server proxy zariadenia"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Vyberte globálny server proxy, ktorý sa bude používať po aktivácii pravidiel. Platný globálny server proxy nastavuje iba prvý správca zariadenia."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Nastaviť dátum vypršania platnosti hesla"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Ovládanie doby, po uplynutí ktorej treba zmeniť heslo na odomknutie obrazovky"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Nastav. koniec platnosti hesla"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Nastavte, ako často sa musí zmeniť heslo na uzamknutie obrazovky"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Nastaviť šifr. ukl. priestoru"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Vyžaduje šifrovanie uložených údajov aplikácií"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Použiť ako predvolené nastavenie pre túto akciu."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Vymazanie predvolených hodnôt v časti Nastavenia plochy > Aplikácie > Správa aplikácií."</string> <string name="chooseActivity" msgid="1009246475582238425">"Vyberte akciu"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Túto akciu nemôžu vykonávať žiadne aplikácie."</string> <string name="aerr_title" msgid="653922989522758100">"Je nám ľúto!"</string> <string name="aerr_application" msgid="4683614104336409186">"Aplikácia <xliff:g id="APPLICATION">%1$s</xliff:g> (proces <xliff:g id="PROCESS">%2$s</xliff:g>) bola neočakávane zastavená. Skúste to znova."</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index a460627..3d003fb 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Programu dovoljuje nadzor vibriranja."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"nadzor svetilke"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Programu dovoljuje nadzor svetilke."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"dostop do naprav USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Programu omogoča dostop do naprav USB."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"uveljavitev protokola MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Omogoča dostop do gonilnika jedra MTP za uveljavitev protokola MTP USB."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"preskušanje strojne opreme"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Brisanje (s tovarniško ponastavitvijo) vseh podatkov v telefonu brez opozorila"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Nastavitev globalnega strežnika proxy za napravo"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Nastavite globalni strežnik proxy naprave, ki bo v uporabi, ko je pravilnik omogočen. Samo skrbnik prve naprave lahko nastavi veljaven globalni strežnik proxy."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Nastavitev poteka gesla"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Nastavite, koliko časa prej je treba spremeniti geslo za odklepanje zaslona"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Nastavitev poteka gesla za zaklepanje zaslona"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Določite, kako pogosto je treba spremeniti geslo za zaklepanje zaslona"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Nastavitev šifriranja shrambe"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Shranjeni podatki programa morajo biti šifrirani"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Privzeta uporaba za to dejanje."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Počistite privzete nastavitve v razdelku Osnovne nastavitve > Programi > Upravljanje programov."</string> <string name="chooseActivity" msgid="1009246475582238425">"Izberite dejanje"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Tega dejanja ne more izvesti noben program."</string> <string name="aerr_title" msgid="653922989522758100">"Oprostite."</string> <string name="aerr_application" msgid="4683614104336409186">"Program <xliff:g id="APPLICATION">%1$s</xliff:g> (postopek <xliff:g id="PROCESS">%2$s</xliff:g>) se je nepričakovano ustavil. Poskusite znova."</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index a6f1e5f..a8d9e29 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Омогућава да апликација контролише вибрације."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"контрола осветљења"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Омогућава да апликација контролише осветљење."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"приступ USB уређајима"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Омогућава апликацији приступ USB уређајима."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"примени MTP протокол"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Омогућава приступ основном MTP управљачком програму ради примене MTP USB протокола."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"тестирање хардвера"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Брисање података на телефону без упозорења враћањем фабричких података"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Подесите глобални прокси сервер уређаја"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Подесите глобални прокси сервер уређаја који ће се користити док су омогућене смернице. Само први администратор уређаја поставља ефективни глобални прокси сервер."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Подеси време истека лозинке"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Контролишите време када лозинка за закључавање екрана треба да се промени"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Подешавање истека лозинке екрана"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Контролишите колико често лозинка за закључавање екрана мора да се мења"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Подешавање шифровања складишта"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Захтева да сачувани подаци апликације буду шифровани"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Подразумевано користи за ову радњу."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Обришите подразумевана подешавања у оквиру ставки Подешавања почетне странице > Апликације > Управљање апликацијама."</string> <string name="chooseActivity" msgid="1009246475582238425">"Избор радње"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Ниједна апликација не може да изврши ову радњу."</string> <string name="aerr_title" msgid="653922989522758100">"Жао нам је!"</string> <string name="aerr_application" msgid="4683614104336409186">"Апликација <xliff:g id="APPLICATION">%1$s</xliff:g> (процес <xliff:g id="PROCESS">%2$s</xliff:g>) је неочекивано заустављена. Покушајте поново."</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 1c234c2..9b93047 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Tillåter att programmet styr vibratorn."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"styra lampa"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Tillåter att programmet styr lampan."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"åtkomst till USB-enheter"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Tillåter att programmet använder USB-enheter."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"implementera MTP-protokoll"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Ger åtkomst till MTP-kerneldrivrutinen för att implementera MTP/USB-protokollet."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"testa maskinvara"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Ta bort data från telefonen utan förvarning genom att återställa standardinställningarna"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Ange global proxyserver"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Ange vilken global proxyserver som ska användas när policyn är aktiverad. Endast den första enhetsadministratören anger den faktiska globala proxyservern."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Ange lösenordets utgångsdatum"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Se hur långt det är kvar till du måste ändra lösenordet till låsningsskärmen"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Ange lösenordets utgångsdatum"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Styr hur ofta lösenordet till skärmlåset måste ändras"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Ange krypterad lagring"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Kräv att sparade applikationsdata krypteras."</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Använd som standard för denna åtgärd."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Rensa standardinställning i Startinställningar > Appar > Hantera appar."</string> <string name="chooseActivity" msgid="1009246475582238425">"Välj en åtgärd"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Inga appar kan utföra den här åtgärden."</string> <string name="aerr_title" msgid="653922989522758100">"Tyvärr!"</string> <string name="aerr_application" msgid="4683614104336409186">"Processen <xliff:g id="PROCESS">%2$s</xliff:g> för programmet <xliff:g id="APPLICATION">%1$s</xliff:g> stoppades oväntat. Försök igen."</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 90747d7..62dfc29 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"อนุญาตให้แอปพลิเคชันควบคุมการสั่นเตือน"</string> <string name="permlab_flashlight" msgid="2155920810121984215">"ควบคุมไฟฉาย"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"อนุญาตให้แอปพลิเคชันควบคุมไฟฉาย"</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"เข้าถึงอุปกรณ์ USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"อนุญาตให้แอปพลิเคชันเข้าถึงอุปกรณ์ USB"</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"ใช้โปรโตคอล MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"อนุญาตการเข้าถึงไดรเวอร์ Kernel MTP เพื่อใช้โปรโตคอล MTP USB"</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"ทดสอบฮาร์ดแวร์"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"ลบข้อมูลของโทรศัพท์โดยไม่มีการเตือน ด้วยการดำเนินการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"ตั้งค่าพร็อกซีส่วนกลางของอุปกรณ์"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"ตั้งค่าพร็อกซีส่วนกลางของอุปกรณ์ที่จะใช้ขณะเปิดการใช้งานนโยบาย เฉพาะผู้ดูแลอุปกรณ์คนแรกเท่านั้นที่ตั้งค่าพร็อกซีส่วนกลางที่มีผลบังคับ"</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"ตั้งค่าการหมดอายุของรหัสผ่าน"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"ควบคุมระยะเวลาก่อนที่จะต้องเปลี่ยนรหัสผ่านการล็อกหน้าจอ"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"ตั้งค่าวันหมดอายุของรหัสผ่านล็อกหน้าจอ"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"ควบคุมความถี่ในการเปลี่ยนรหัสผ่านล็อกหน้าจอ"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"ตั้งค่าการเข้ารหัสที่เก็บข้อมูล"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"กำหนดว่าแอปพลิเคชันที่จัดเก็บต้องมีการเข้ารหัส"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"ใช้ค่าเริ่มต้นสำหรับการทำงานนี้"</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"ล้างข้อมูลค่าเริ่มต้นในการตั้งค่าหน้าแรก > แอปพลิเคชัน > จัดการแอปพลิเคชัน"</string> <string name="chooseActivity" msgid="1009246475582238425">"เลือกการทำงาน"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"ไม่มีแอปพลิเคชันใดทำงานนี้ได้"</string> <string name="aerr_title" msgid="653922989522758100">"ขออภัย!"</string> <string name="aerr_application" msgid="4683614104336409186">"แอปพลิเคชัน <xliff:g id="APPLICATION">%1$s</xliff:g> (กระบวนการ <xliff:g id="PROCESS">%2$s</xliff:g> หยุดทำงานโดยไม่คาดหมาย โปรดลองอีกครั้ง"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 713fca9..08c3ff7 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Pinapayagan ang application na kontrolin ang vibrator."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"kontrolin ang flashlight"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Pinapayagan ang application na kontrolin ang flashlight."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"i-access ang mga USB device"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Pinapayagan ang application na i-access ang mga USB device."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"ipatupad ang MTP protocol"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Pinapayagan ang access sa kernel MTP driver upang maipatupad ang MTP USB protocol."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"subukan ang hardware"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Burahin ang data ng telepono nang walang babala, sa pamamagitan ng pagsasagawa ng pag-reset sa data ng factory"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Itakda ang pandaigdigang proxy ng device"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Itakda ang pandaigdigang proxy ng device na gagamitin habang pinagana ang patakaran. Tanging ang unang admin ng device ang magtatakda sa may bisang pandaigdigang proxy."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Itakda pag-expire ng password"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Kontrolin kung gaano katagal bago kailangang palitan ang password sa pag-lock ng screen"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Itakda expire password pag-lock scr"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Kontrolin kung gaano kadalas dapat na mapalitan ang password sa pag-lock ng screen"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Itakda pag-encrypt ng imbakan"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Hinging naka-encrypt ang nakaimbak na data ng application"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Gamitin bilang default para sa pagkilos na ito."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"I-clear ang default sa Mga Setting ng Home > Mga Application > Pamahalaan ang mga application."</string> <string name="chooseActivity" msgid="1009246475582238425">"Pumili ng pagkilos"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Walang mga application ang makakapagsagawa ng pagkilos na ito."</string> <string name="aerr_title" msgid="653922989522758100">"Paumanhin!"</string> <string name="aerr_application" msgid="4683614104336409186">"Hindi inaasahang humito ang <xliff:g id="APPLICATION">%1$s</xliff:g> (proseso <xliff:g id="PROCESS">%2$s</xliff:g>) ng application. Pakisubukang muli."</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index d7a5008..0b0ef01 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Uygulamanın titreşimi denetlemesine izin verir."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"flaşı denetle"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Uygulamaların flaş ışığını denetlemesine izin verir."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"USB cihazlarına erişme"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Uygulamaların USB cihazlarına erişimine izin verir"</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"MTP protokolünü uygula"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"MTP USB protokolünü uygulamak için çekirdekteki MTP sürücüsüne erişim izni ver."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"donanımı test et"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Fabrika verilerine sıfırlama işlemi gerçekleştirerek telefondaki verileri uyarıda bulunmadan silin"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Cihaz genelinde geçerli proxy\'i ayarla"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Politika etkin olduğunda kullanılacak cihaz genelinde geçerli proxy\'yi ayarlayın. Etkin genel proxy\'yi yalnızca ilk cihaz yöneticisi ayarlar."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Şifre süre sonu tarihi ayarla"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Ekran kilitleme şifresinin ne kadar süre sonra değiştirilmesi gerekeceğini denetleyin."</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Ekr kilt şifr süre sonu ayarla"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Ekran kilitleme şifresinin hangi sıklıkla değiştirilmesi gerektiğini denetleyin"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Deplm şifrelemesini ayarla"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Depolanan uygulama verisinin şifrelenmiş olmasını gerektir"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Varsayılan olarak bu işlem için kullan."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Giriş Ayarları > Uygulamalar > Uygulamaları yönet\'te varsayılanı temizleyin."</string> <string name="chooseActivity" msgid="1009246475582238425">"İşlem seç"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Hiçbir uygulama bu işlemi yapamaz."</string> <string name="aerr_title" msgid="653922989522758100">"Üzgünüz!"</string> <string name="aerr_application" msgid="4683614104336409186">"<xliff:g id="APPLICATION">%1$s</xliff:g> uygulaması (<xliff:g id="PROCESS">%2$s</xliff:g> işlemi) beklenmedik biçimde durdu. Lütfen yeniden deneyin."</string> @@ -824,7 +828,7 @@ <string name="anr_application_process" msgid="4185842666452210193">"<xliff:g id="APPLICATION">%1$s</xliff:g> uygulaması (<xliff:g id="PROCESS">%2$s</xliff:g> işleminde) yanıt vermiyor."</string> <string name="anr_process" msgid="1246866008169975783">"<xliff:g id="PROCESS">%1$s</xliff:g> işlemi yanıt vermiyor."</string> <string name="force_close" msgid="3653416315450806396">"Kapanmaya zorla"</string> - <string name="report" msgid="4060218260984795706">"Rapor"</string> + <string name="report" msgid="4060218260984795706">"Bildir"</string> <string name="wait" msgid="7147118217226317732">"Bekle"</string> <string name="launch_warning_title" msgid="8323761616052121936">"Uygulama yönlendirildi"</string> <string name="launch_warning_replace" msgid="6202498949970281412">"<xliff:g id="APP_NAME">%1$s</xliff:g> şimdi çalışıyor."</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 7c329c5..eabbea1 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Дозволяє програмі контролювати вібросигнал."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"контр. блим. світло"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Дозволяє програмі контролювати світловий сигнал."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"отр.дост.до прист.USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Дозволяє програмі отрим. доступ до пристр. USB."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"впроваджувати протокол MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Дозволяє доступ до драйвера ядра MTP для впровадження протоколу MTP (USB)."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"тест-ти обладн."</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Видаляє дані телефону без попередження, відновлюючи заводські налаштування"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Установ. глоб. проксі пристрою"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Устан. використ. глоб. проксі, коли ввімкнено політику. Лише адміністратор першого пристрою встановлює активний глоб. проксі."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Установити термін дії пароля"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Регулює, за скільки часу перед блокуванням екрана треба змінювати пароль"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Установити термін дії пароля блокування екрана"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Контролювати частоту зміни пароля блокування екрана"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Установити шифрування носія"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Потрібно, щоб дані збереженої програми були зашифровані"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Використ. за умовч. для цієї дії."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Очист. налашт. за умовч. у Дом. налашт. > Програми > Керув. програмами."</string> <string name="chooseActivity" msgid="1009246475582238425">"Виберіть дію"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Жодна програма не може виконати цю дію."</string> <string name="aerr_title" msgid="653922989522758100">"Помилка!"</string> <string name="aerr_application" msgid="4683614104336409186">"Програма <xliff:g id="APPLICATION">%1$s</xliff:g> (процес <xliff:g id="PROCESS">%2$s</xliff:g>) несподівано зупинилася. Спробуйте ще."</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 49c9e44..812004b 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"Cho phép ứng dụng kiểm soát bộ rung."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"kiểm soát đèn nháy"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"Cho phép ứng dụng kiểm soát đèn nháy."</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"truy cập bộ nhớ USB"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"Cho phép ứng dụng truy cập thiết bị USB."</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"triển khai giao thức MTP"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Cho phép truy cập tới trình điều khiển MTP nhân hệ điều hành để triển khai giao thức MTP USB."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"kiểm tra phần cứng"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"Xóa dữ liệu trên điện thoại mà không cần cảnh báo, bằng cách thực hiện đặt lại về dữ liệu gốc"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Đặt proxy chung của điện thoại"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Đặt proxy chung của điện thoại được sử dụng trong khi chính sách được bật. Chỉ quản trị viên đầu tiên của điện thoại mới có thể đặt proxy chung hiệu quả."</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"Đặt hết hạn mật khẩu"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"Kiểm soát thời lượng trước khi mật khẩu khóa màn hình cần được thay đổi"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Đặt hết hạn mật khẩu khóa màn hình"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"Kiểm soát tần suất bắt buộc phải thay đổi mật khẩu khóa màn hình"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Đặt mã hóa dung lượng lưu trữ"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Yêu cầu dữ liệu ứng dụng được lưu trữ phải được mã hóa"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"Sử dụng theo mặc định đối với tác vụ này."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Xoá mặc định trong Cài đặt Màn hình trang chủ > Ứng dụng> Quản lý ứng dụng."</string> <string name="chooseActivity" msgid="1009246475582238425">"Chọn tác vụ"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"Không ứng dụng nào có thể thực hiện tác vụ này."</string> <string name="aerr_title" msgid="653922989522758100">"Rất tiếc!"</string> <string name="aerr_application" msgid="4683614104336409186">"Ứng dụng <xliff:g id="APPLICATION">%1$s</xliff:g> (quá trình <xliff:g id="PROCESS">%2$s</xliff:g>) đã dừng đột ngột. Vui lòng thử lại."</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 640b9bc..3b70dd7 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"允许应用程序控制振动器。"</string> <string name="permlab_flashlight" msgid="2155920810121984215">"控制闪光灯"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"允许应用程序控制闪光灯。"</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"访问 USB 设备"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"允许应用程序访问 USB 设备。"</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"应用 MTP 协议"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"允许访问内核 MTP 驱动程序，以便应用 MTP USB 协议。"</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"测试硬件"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"恢复出厂设置时，将擦除手机上的数据而不发送警告"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"设置设备全局代理"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"请设置在启用政策的情况下要使用的设备全局代理。只有第一设备管理员才可设置有效的全局代理。"</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"设置密码有效期"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"控制屏幕锁定密码的使用期限"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"设置锁定屏幕密码的有效期"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"控制锁定屏幕密码的更改频率"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"设置存储设备加密"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"需要对存储的应用程序数据进行加密"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"默认使用此方式发送。"</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"通过主屏幕上的“设置”>“应用程序”>“管理应用程序”清除默认设置。"</string> <string name="chooseActivity" msgid="1009246475582238425">"选择一项操作"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"没有应用程序可执行此操作。"</string> <string name="aerr_title" msgid="653922989522758100">"很抱歉！"</string> <string name="aerr_application" msgid="4683614104336409186">"应用程序 <xliff:g id="APPLICATION">%1$s</xliff:g>（进程：<xliff:g id="PROCESS">%2$s</xliff:g>）意外停止，请重试。"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index fe1d78d..e72b28e 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -361,8 +361,10 @@ <string name="permdesc_vibrate" msgid="2886677177257789187">"允許應用程式控制震動。"</string> <string name="permlab_flashlight" msgid="2155920810121984215">"控制閃光燈"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"允許應用程式控制閃光燈。"</string> - <string name="permlab_accessUsb" msgid="7362327818655760496">"存取 USB 裝置"</string> - <string name="permdesc_accessUsb" msgid="2414271762914049292">"允許應用程式存取 USB 裝置。"</string> + <!-- no translation found for permlab_manageUsb (1113453430645402723) --> + <skip /> + <!-- no translation found for permdesc_manageUsb (6148489202092166164) --> + <skip /> <string name="permlab_accessMtp" msgid="4953468676795917042">"執行 MTP 通訊協定"</string> <string name="permdesc_accessMtp" msgid="6532961200486791570">"允許存取核心 MTP 驅動程式，以執行 MTP USB 通訊協定。"</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"測試硬體"</string> @@ -484,8 +486,8 @@ <string name="policydesc_wipeData" product="default" msgid="7669895333814222586">"執行重設為原廠設定時，系統會直接清除手機資料而不提出警告"</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"設定裝置全域 Proxy"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"設定政策啟用時所要使用的裝置全域 Proxy，只有第一個裝置管理員所設定的全域 Proxy 具有效力。"</string> - <!-- outdated translation 4740941403188940274 --> <string name="policylab_expirePassword" msgid="885279151847254056">"設定密碼到期日"</string> - <!-- outdated translation 6626724939177185949 --> <string name="policydesc_expirePassword" msgid="4844430354224822074">"控制螢幕鎖定密碼的使用期限"</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"設定螢幕上鎖密碼到期日"</string> + <string name="policydesc_expirePassword" msgid="4844430354224822074">"控制螢幕上鎖密碼的變更頻率"</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"設定儲存裝置加密"</string> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"必須為儲存的應用程式資料加密"</string> <string-array name="phoneTypes"> @@ -814,6 +816,8 @@ <string name="alwaysUse" msgid="4583018368000610438">"以此為本操作預設值。"</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"清除首頁設定 (應用程式) 管理應用程式的預設值。"</string> <string name="chooseActivity" msgid="1009246475582238425">"選取一項操作"</string> + <!-- no translation found for chooseUsbActivity (7892597146032121735) --> + <skip /> <string name="noApplications" msgid="1691104391758345586">"沒有應用程式可執行此項操作。"</string> <string name="aerr_title" msgid="653922989522758100">"很抱歉！"</string> <string name="aerr_application" msgid="4683614104336409186">"<xliff:g id="APPLICATION">%1$s</xliff:g> 應用程式 (程序：<xliff:g id="PROCESS">%2$s</xliff:g>) 異常終止。請再試一次。"</string> diff --git a/data/fonts/DroidSans-Bold.ttf b/data/fonts/DroidSans-Bold.ttf Binary files differindex 7ac04b6..d065b64 100644 --- a/data/fonts/DroidSans-Bold.ttf +++ b/data/fonts/DroidSans-Bold.ttf diff --git a/data/fonts/DroidSans.ttf b/data/fonts/DroidSans.ttf Binary files differindex 767c63a..ad1efca 100644 --- a/data/fonts/DroidSans.ttf +++ b/data/fonts/DroidSans.ttf diff --git a/data/fonts/DroidSansArabic.ttf b/data/fonts/DroidSansArabic.ttf Binary files differindex 660e2a9..bdefaac 100644 --- a/data/fonts/DroidSansArabic.ttf +++ b/data/fonts/DroidSansArabic.ttf diff --git a/data/fonts/DroidSansFallback.ttf b/data/fonts/DroidSansFallback.ttf Binary files differindex 8c6fabe..ba9d76f 100644 --- a/data/fonts/DroidSansFallback.ttf +++ b/data/fonts/DroidSansFallback.ttf diff --git a/data/fonts/DroidSansMono.ttf b/data/fonts/DroidSansMono.ttf Binary files differindex 6e79dad..a007071 100644 --- a/data/fonts/DroidSansMono.ttf +++ b/data/fonts/DroidSansMono.ttf diff --git a/data/fonts/DroidSerif-Bold.ttf b/data/fonts/DroidSerif-Bold.ttf Binary files differindex 85d6c6b..838d255 100644 --- a/data/fonts/DroidSerif-Bold.ttf +++ b/data/fonts/DroidSerif-Bold.ttf diff --git a/data/fonts/DroidSerif-BoldItalic.ttf b/data/fonts/DroidSerif-BoldItalic.ttf Binary files differindex 9d8e798..0b1601f 100644 --- a/data/fonts/DroidSerif-BoldItalic.ttf +++ b/data/fonts/DroidSerif-BoldItalic.ttf diff --git a/data/fonts/DroidSerif-Italic.ttf b/data/fonts/DroidSerif-Italic.ttf Binary files differindex 6acc86d..2972809 100644 --- a/data/fonts/DroidSerif-Italic.ttf +++ b/data/fonts/DroidSerif-Italic.ttf diff --git a/data/fonts/DroidSerif-Regular.ttf b/data/fonts/DroidSerif-Regular.ttf Binary files differindex 8c1c2c4..5b4fe81 100644 --- a/data/fonts/DroidSerif-Regular.ttf +++ b/data/fonts/DroidSerif-Regular.ttf diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index c258949..fa588cb 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -310,7 +310,7 @@ <span class="en">Search</span> </a></div> <ul> - <li><a href="<?cs var:toroot?>guide/topics/search/search-dialog.html">Using the Android Search Dialog</a></li> + <li><a href="<?cs var:toroot?>guide/topics/search/search-dialog.html">Creating a Search Interface</a></li> <li><a href="<?cs var:toroot?>guide/topics/search/adding-recent-query-suggestions.html">Adding Recent Query Suggestions</a></li> <li><a href="<?cs var:toroot?>guide/topics/search/adding-custom-suggestions.html">Adding Custom Suggestions</a></li> <li><a href="<?cs var:toroot?>guide/topics/search/searchable-config.html">Searchable Configuration</a></li> diff --git a/docs/html/guide/practices/optimizing-for-3.0.jd b/docs/html/guide/practices/optimizing-for-3.0.jd index a22e69a..5cd519b 100644 --- a/docs/html/guide/practices/optimizing-for-3.0.jd +++ b/docs/html/guide/practices/optimizing-for-3.0.jd @@ -5,20 +5,32 @@ page.title=Optimizing Apps for Android 3.0 <div id="qv"> <h2>In this document</h2> <ol> -<li><a href="#Setup">Set Up Your SDK with Android 3.0</a></li> -<li><a href="#SearchableConfiguration">Optimize Your App for Tablets and Similar Devices</a></li> -<li><a href="#SearchableActivity">Upgrade or Develop a New App for Tablets and Similar -Devices</a></li> +<li><a href="#Setup">Setting Up Your SDK with Android 3.0</a></li> +<li><a href="#Optimizing">Optimizing Your App for Tablets</a></li> +<li><a href="#Upgrading">Upgrading or Developing a New App for Tablets</a></li> +<li><a href="#ManagingAppDist">Managing App Distribution Based on Screen Configuration</a> + <ol> + <li><a href="#FilteringTabletApps">Filtering a tablet app from mobile devices</a></li> + <li><a href="#FilteringMobileApps">Filtering a mobile device app from tablets</a></li> + </ol> +</li> +<li><a href="#Issues">Other Issues</a> + <ol> + <li><a href="#Landscape">Adding support for landscape screens</a></li> + <li><a href="#Telephony">Using telephony or other variable features</a></li> + </ol> +</li> </ol> </div> </div> -<p>If you're developing an Android application, Android 3.0 introduces several features that allow +<p>Android 3.0 introduces several features that allow you to enhance your user's experience on tablets and similar devices. Any application you've already published is compatible with devices running Android 3.0, by default, because Android applications -are forward-compatible. However, there are some simple changes you should make to optimize your -application for tablet-type devices.</p> +are forward-compatible. However, new tablet devices running Android 3.0 are now available to the +public and provide users a new Android experience on a larger screen, so you should make sure +your application looks and works great on the new platform and new device form-factors.</p> <p>This document shows how you can optimize your existing application for Android 3.0 and maintain compatibility with older versions or upgrade your application completely with new APIs.</p> @@ -27,18 +39,28 @@ maintain compatibility with older versions or upgrade your application completel <p><b>To get started:</b></p> <ol> - <li><a href="#Setup">Set up your SDK with Android 3.0</a>.</li> - <li>Then choose to either optimize or upgrade: + <li><a href="#Setup">Set up your SDK with Android 3.0</a>. + <p>Install the Android 3.0 platform, new tools, and set up a new AVD.</p></li> + <li>Choose to either optimize or upgrade: <ol type="a"> - <li><a href="#Optimize">Optimize Your App for Tablets and Similar Devices</a>. - <p>When you have an existing application and want to maintain compatibility with -older versions of Android.</p> + <li><a href="#Optimizing">Optimize your app for tablets and similar devices</a>. + <p>Read this section if you have an existing application and want to +maintain compatibility with older versions of Android. All you need to do is update your +manifest file to declare support for Android 3.0, test your application on the new platform, and +add extra resources to support extra large screens, as appropriate.</p> </li> - <li><a href="#Upgrade">Upgrade or Develop a New App for Tablets and Similar Devices</a>. - <p>When you want to upgrade your application to use APIs introduced in Android 3.0 or - create a new application targeted to tablets and similar devices.</p></li> + <li><a href="#Upgrading">Upgrade or develop a new app for tablets and similar devices</a>. + <p>Read this section if you want to upgrade your application to use APIs introduced in +Android 3.0 or create a new application targeted to tablets and similar devices. Compared to +upgrading to previous versions of Android, there's nothing different about upgrading to Android 3.0. +This section introduces some of the key features and APIs you should use to make an +application that's fully enhanced for tablets.</p></li> </ol> </li> + <li>Consider whether you need to <a href="#ManagingAppDist">manage the distribution of your +application based on screen configuration</a>.</li> + <li>Then review some <a href="#Issue">other issues</a> you might encounter when developing +for tablets and similar devices.</li> </ol> @@ -66,14 +88,16 @@ device: <p>Set the target to "Android 3.0" and the skin to "WXGA" (the default skin).</p></li> </ol> +<p>The best way to test your application on Android 3.0 is to use real hardware running Android 3.0, +such as the <a href="http://www.motorola.com/staticfiles/Consumers/XOOM/index.html">Motorola +Xoom</a>. Of course, you can also use the Android emulator on your development machine, but because +the Android emulator must simulate the ARM instruction set on your computer and the WXGA screen is +significantly larger than a typical virtual device, emulator performance is much slower than a real +device.</p> <h3>About emulator performance</h3> -<p>Because the Android emulator must simulate the ARM instruction set on your computer -and the WXGA screen is significantly larger than a typical virtual device, emulator performance is -much slower than a real device.</p> - -<p>In particular, initializing the emulator can be slow and can take several minutes, depending on +<p>Initializing the emulator can be slow and can take several minutes, depending on your hardware. When the emulator is booting, there is limited user feedback, so please be patient and wait until you see the home screen (or lock screen) appear. </p> @@ -82,9 +106,10 @@ application—typically you only need to boot at the start of a session and Also see the tip below for information about using a snapshot to drastically reduce startup time after the first initialization. </p> -<p>We're working hard to resolve the performance issues and it will improve in future tools -releases. For the time being, the emulator is still best way to evaluate your application's -appearance and functionality on Android 3.0 without a real device.</p> +<p>General performance in the emulator is also slow. We're working hard to resolve the performance +issues and it will improve in future tools releases. If you don't yet have a real device running +Android 3.0, the emulator is still best way to evaluate your application's appearance and +functionality on Android 3.0.</p> <p class="note"><strong>Tip:</strong> To improve the startup time for the emulator, enable snapshots for the AVD when you create it with the SDK and AVD Manager (there's a checkbox in the AVD creator @@ -97,7 +122,7 @@ time).</p> -<h2 id="Optimize">Optimize Your Application for Tablets and Similar Devices</h2> +<h2 id="Optimizing">Optimizing Your App for Tablets</h2> <p>If you've already developed an application for an earlier version of Android, there are a few things you can do to optimize it for a tablet-style experience on Android 3.0 without changing the @@ -142,21 +167,24 @@ android:targetSdkVersion}</a> to {@code "11"}. For example: </pre> <p>By targeting the Android 3.0 platform, the system automatically applies the holographic theme to each activity when your application runs on an Android 3.0 device. The holographic theme -provides a new design for widgets, such as buttons and text boxes, and restyles other -visual elements. This is the standard theme in applications built for Android 3.0, so your -application will look more at home by enabling the theme.</p> - <p>Additionally, the holographic theme enables the <a -href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> in your activities when running on an -Android 3.0 device. The Action Bar replaces the traditional title bar at the top of the activity -window and provides the user access to the activity's Options Menu.</p> +provides a new design for widgets, such as buttons and text boxes, and new styles for other +visual elements. This is the standard theme for applications built for Android 3.0, so your +application will look and feel consistent with the system and other applications when it is +enabled.</p> + <p>Additionally, when an activity uses the holographic theme, the system enables the <a +href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> for the activity. The Action Bar +replaces the traditional title bar at the top of the activity window and provides the user access to +the activity's Options Menu.</p> </li> - <li>Continue to build your application against the minimum version specified by <a -href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code android:minSdkVersion}</a>, -but install it on the Android 3.0 AVD. Repeat your tests to be sure that your user interface works -well with the holographic theme. + <li>Build your application against the same version of the Android platform you have been +using previously (such as the version declared in your <a +href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code android:minSdkVersion}</a>), +but install it on the Android 3.0 AVD. (You should not build against Android 3.0 unless you are +using new APIs.) Repeat your tests to be sure that your user interface works well with the +holographic theme. <p class="note"><strong>Note:</strong> If you have applied other themes directly to your activities, they will override the inherited holographic theme. To resolve this, you can use -the <a href="{@docRoot}guide/topics/resources/providing-resources.html#VersionQualifier">system +the <a href="{@docRoot}guide/topics/resources/providing-resources.html#VersionQualifier">platform version qualifier</a> to provide an alternative theme for Android 3.0 devices that's based on the holographic theme. For more information, read how to <a href="{@docRoot}guide/topics/ui/themes.html#SelectATheme">select a theme based on platform @@ -177,15 +205,24 @@ screens:</p> (wide), so you should be sure that your activities offer a layout that's optimized for a wide viewing area. <p>You can specify landscape resources with the <code>land</code> resource qualifier, but if you want alternative resources for an extra large landscape screen, you -should use both <code>xlarge</code> and <code>land</code> qualifiers. For example, {@code +should use both the <code>xlarge</code> and <code>land</code> qualifiers. For example, {@code res/layout-xlarge-land/}. The order of the qualifier names is important; see <a href="{@docRoot}guide/topics/resources/providing-resources.html#AlternativeResources"> Providing Alternative Resources</a> for more information.</p></li> - <li>Button position: Consider whether the position of the most common buttons in your UI are -easily accessible while holding a tablet with two hands.</li> + <li>Button position and size: Consider whether the position and size of the most common +buttons in your UI make them easily accessible while holding a tablet with two hands. In some +cases, you might need to resize buttons, especially if they use {@code "wrap_content"} +as the width value. To enlarge the buttons, if necessary, you should either: add +extra padding to the button; specify dimension values with {@code dp} units; or use {@code +android:layout_weight} when the button is in a <a +href="{@docRoot}guide/topics/ui/layout-objects.html#linearlayout">linear layout</a>. Use your +best judgment of proportions for each screen size—you don't want the buttons to be too big, +either.</li> <li>Font sizes: Be sure your application uses {@code sp} units when setting font -sizes. This alone should ensure a readable experience on tablet-style devices. In some cases, -however, you might want to consider larger font sizes for <code>xlarge</code> configurations.</li> +sizes. This alone should ensure a readable experience on tablet-style devices, because it is a +scale-independent pixel unit, which will resize as appropriate for the current screen configuration. +In some cases, however, you still might want to consider larger font sizes for <code>xlarge</code> +configurations.</li> </ul> <p>In general, always be sure that your application follows the <a href="{@docRoot}guide/practices/screens_support.html#screen-independence">Best Practices @@ -197,7 +234,29 @@ for Screen Independence</a>.</p> -<h2 id="Upgrade">Upgrade or Develop a New App for Tablets and Similar Devices</h2> + +<h2 id="Upgrading">Upgrading or Developing a New App for Tablets</h2> + +<div class="sidebox-wrapper"> +<div class="sidebox"> + <h3>Use new APIs and remain backward-compatible</h3> +<p>It is possible for you to upgrade your application with some new +APIs <em>and</em> remain compatible with older versions of Android. Usually, this requires that you +use techniques such as reflection to check for the availability of certain APIs at runtime. However, +to help you add features from Android 3.0 without requiring you to change your <a +href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code android:minSdkVersion}</a> +or build target, we're providing a static library called the "Android Compatibility package" +(downloadable from the AVD and SDK Manager).</p> +<p>This library includes APIs for <a +href="{@docRoot}guide/topics/fundamentals/fragments.html">fragments</a>, <a +href="{@docRoot}guide/topics/fundamentals/loaders.html">loaders</a>, and some updated classes. By +simply adding this library to your Android project, you can use these APIs in your application and +remain compatible with Android 1.6. For more information, see the blog post, <a +href="http://android-developers.blogspot.com/2011/03/fragments-for-all.html">Fragments for +All</a>.</p> +</div> +</div> + <p>If you want to develop an application that's fully enhanced for tablet-type devices running Android 3.0, then you need to use new APIs in Android 3.0. This section introduces some of @@ -206,9 +265,11 @@ the new features you should use.</p> <h3>Declare the minimum system version</h3> -<p>The first thing to do when you create a project for Android 3.0 is set your manifest's <a -href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code android:minSdkVersion}</a> -to {@code "11"}. For example:</p> +<p>The first thing to do when you upgrade or create a project for Android 3.0 is set your manifest's +<a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code +android:minSdkVersion}</a> to {@code "11"}. This declares that your application uses APIs available +in Android 3.0 and greater, so it should not be available to devices running an older version of +Android. For example:</p> <pre> <manifest ... > @@ -218,9 +279,11 @@ to {@code "11"}. For example:</p> <application> </manifest> </pre> - -<p>By targeting the Android 3.0 platform, the system automatically applies the new holographic theme -to each of your activities.</p> + +<p>Not only is this necessary in order to declare the minimum API level your application requires, +but it enables the new holographic theme to each of your activities. The holographic theme is the +standard theme for the Android 3.0 system and all applications designed for it. It includes new +designs for the system widgets and overall appearance.</p> <p>Additionally, the holographic theme enables the Action Bar for each activity.</p> @@ -229,13 +292,14 @@ to each of your activities.</p> <p>The Action Bar is a widget for activities that replaces the traditional title bar at the top of the screen. By default, the Action Bar includes the application logo on the left side, followed by -the activity title, and any available items from the Options Menu on the right side.</p> +the activity title, and access to items from the Options Menu in a drop-down list on the right +side.</p> -<p>You can enable items from your activity's Options Menu to appear directly in the Action Bar as -"action items" by adding {@code showAsAction="ifRoom"} to specific items in your <a +<p>You can enable items from the Options Menu to appear directly in the Action Bar as +"action items" by adding {@code showAsAction="ifRoom"} to specific menu items in your <a href="{@docRoot}guide/topics/resources/menu-resource.html">menu resource</a>. You can also add navigation features to the Action Bar, such as tabs, and use the application icon to navigate to -your application's "home" activity or "up" the activity hierarchy.</p> +your application's "home" activity or to navigate "up" the application's activity hierarchy.</p> <p>For more information, read <a href="{@docRoot}guide/topics/ui/actionbar.html">Using the Action Bar</a>.</p> @@ -244,11 +308,12 @@ Action Bar</a>.</p> <h3>Divide your activities into fragments</h3> -<p>A fragment represents a behavior or a portion of user interface in an activity. You can combine -multiple fragments in a single activity to build a multi-pane UI and reuse a fragment in multiple -activities. You can think of a fragment as a modular section of an activity, which has its own -lifecycle, receives its own input events, and which you can add or remove while the activity is -running.</p> +<p>A fragment represents a behavior or a portion of user interface in an activity. You can think of +a fragment as a modular section of an activity, which has its own lifecycle, receives its own input +events, and which you can add or remove while the activity is running. Fragments are an optional +component for your activities that allow you to build a multi-pane UI and reuse them in multiple +activities. If you're building an application for tablets, we recommend that you use fragments to +create activities that offer a more dynamic and flexible user interface.</p> <p>For example, a news application can use one fragment to show a list of articles on the left and another fragment to display an article on the right—both fragments appear in one activity, @@ -262,8 +327,8 @@ href="{@docRoot}guide/topics/fundamentals/fragments.html">Fragments</a> document <h3>Use new animation APIs for transitions</h3> -<p>An all new flexible animation framework allows you to animate arbitrary properties of any object -(View, Drawable, Fragment, Object, or anything else). You can define several animation aspects +<p>An all-new animation framework allows you to animate arbitrary properties of any object +(such as a View, Drawable, Fragment, or anything else). You can define several animation aspects (such as duration, repeat, interpolation, and more) for an object's int, float, and hexadecimal color values, by default. That is, when an object has a property field for one of these types, you can change its value over time to affect an animation.</p> @@ -279,8 +344,9 @@ href="{@docRoot}guide/topics/graphics/animation.html">Property Animation</a> doc <h3>Enable hardware acceleration</h3> -<p>You can now enable the OpenGL renderer for your application by setting {@code -android:hardwareAccelerated="true"} in your manifest's <a +<p>Android 3.0 adds a hardware-accelerated OpenGL renderer that gives a performance boost to most 2D +graphics operations. You can enable hardware-accelerated rendering in your application by setting +{@code android:hardwareAccelerated="true"} in your manifest's <a href="{@docRoot}guide/topics/manifest/application-element.html">{@code <application>}</a> element or for individual <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a> elements. Hardware acceleration results in smoother animations, smoother @@ -314,48 +380,16 @@ new graphics engine called Renderscript, and more.</p> href="{@docRoot}sdk/android-3.0.html">Android 3.0 Platform</a> document.</p> -<h3>Publish your app for extra large screens</h3> - -<p>You should also decide whether your application is <em>only</em> for -tablet-type devices (specifically, <em>xlarge</em> devices) or for all types of screen sizes.</p> - -<p>If you want your application to be available to all screen sizes (for example, for all -phones and tablets), there's nothing you need to do. By default, an application with <a -href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code -android:minSdkVersion}</a> set to {@code "4"} or higher will resize to fit any screen size.</p> - -<p>If your application is <em>only</em> for <em>xlarge</em> screens, include the <a -href="{@docRoot}guide/topics/manifest/supports-screens-element.html">{@code -<supports-screens>}</a> element in your manifest and declare that the application supports -only <em>xlarge</em> screens, by declaring all other sizes {@code "false"}. For example:</p> - -<pre> -<manifest ... > - ... - <supports-screens android:smallScreens="false" - android:normalScreens="false" - android:largeScreens="false" - android:xlargeScreens="true" /> - <application ... > - ... - <application> -</manifest> -</pre> - -<p>With this declaration, you indicate that your application does not support any screen size except -extra large. External services such as Android Market may then use this information to filter your -application from devices that do not have an extra large screen.</p> - - <h3>Look at some samples</h3> -<p>Many of the new features and APIs that are described in the <a -href="{@docRoot}sdk/android-3.0.html#api">Android 3.0 Platform Preview</a> also have accompanying -samples that can help you understand how to use them. To get the samples, download them from the SDK -repository using the Android SDK Manager. After downloading the samples ("Samples for SDK API 11"), -you can find them in <code><sdk_root>/samples/android-11/</code>. The links below can help you -find samples for the features you are interested in:</p> +<p>Many of the new features and APIs that are described above and in the <a +href="{@docRoot}sdk/android-3.0.html#api">Android 3.0 Platform</a> document also have accompanying +samples that allow you to preview the effects and can help you understand how to use them. To get +the samples, download them from the SDK repository <a href="{@docRoot}sdk/adding-components.html" +>using the Android SDK and AVD Manager</a>. After downloading the samples ("Samples for SDK API +11"), you can find them in <code><sdk_root>/samples/android-11/</code>. The following list +provides links to the browsable source code for some of the samples:</p> <ul> <li><a href="{@docRoot}resources/samples/HoneycombGallery/index.html">Honeycomb Gallery</a>: @@ -395,3 +429,248 @@ different applications that demonstrate using renderscript APIs for computations graphics.</li> </ul> + + +<h2 id="ManagingAppDist">Managing App Distribution Based on Screen Configuration</h2> + +<p>If your manifest file has either <a +href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code android:minSdkVersion}</a> +or <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code +android:targetSdkVersion}</a> set to {@code "4"} or higher, then the Android system will scale your +application's layout and assets to fit the current device screen, whether the device screen is +smaller or larger than the one for which you originally designed your application. As such, you +should always test your application on real or <a +href="{@docRoot}guide/developing/devices/index.html">virtual devices</a> with various screen sizes +and densities.</p> + +<p>Although we recommend that you design your application to function properly on multiple +configurations of screen size and density, you can instead choose to limit the distribution of your +application to certain types of screens, such as only tablets or only mobile devices. To do so, you +can add elements to your Android manifest file that enable filtering based on screen configuration +by external services such as Android Market.</p> + +<p>However, before you decide to restrict your application to certain screen configurations, you +should understand the techniques for <a +href="{@docRoot}guide/practices/screens_support.html">supporting multiple screens</a> and employ +them to the best of your ability. By supporting multiple screens, your application can be made +available to the greatest number of users with different devices.</p> + + +<h3 id="FilteringTabletApps">Filtering a tablet application from mobile devices</h3> + +<p>If the system scaling adversely affects your application UI when scaling your application down +for smaller screens, you should add <a +href="{@docRoot}guide/topics/resources/providing-resources.html#AlternativeResources">alternative +layouts</a> for smaller screens to adjust your layout. However, sometimes your layout still might +not fit a smaller screen or you've explicitly designed your application only for tablets and other +large devices. In this case, you can manage the availability of your application to smaller screens +by using the <a href="{@docRoot}guide/topics/manifest/supports-screens-element.html">{@code +<supports-screens>}</a> manifest element.</p> + +<p>For example, if you want your application to be available only to extra large +screens, you can declare the element in your manifest like this:</p> + +<pre> +<manifest ... > + ... + <supports-screens android:smallScreens="false" + android:normalScreens="false" + android:largeScreens="false" + android:xlargeScreens="true" /> + <application ... > + ... + <application> +</manifest> +</pre> + +<p>External services such as Android Market read this manifest element and use it to ensure that +your application is available only to devices with an extra large screen.</p> + +<p class="note"><strong>Note:</strong> If you use the <a +href="{@docRoot}guide/topics/manifest/supports-screens-element.html">{@code +<supports-screens>}</a> element for the reverse scenario (when your application is not compatible +with <em>larger</em> screens) and set the larger screen size attributes to {@code "false"}, then +external services such as Android Market <strong>do not</strong> apply filtering. Your application +will still be available to larger screens, but when it runs, it will not fill the screen—the +system will draw it in a "postage stamp" window that's the same relative size as the screen size +that your application does support. If you want to prevent your application from being downloaded on +larger screens, see the following section.</p> + + +<h3 id="FilteringMobileApps">Filtering a mobile device application from tablets</h3> + +<p>Because Android automatically scales applications to fit larger screens, you shouldn't +need to filter your application from larger screens. However, you might discover that your +application can't scale up or perhaps you've decided to publish two versions of your application +that each deliver different features for different screen configurations, so you don't want +larger devices to download the version designed for smaller screens. In such a case, you can +use the <a href="{@docRoot}guide/topics/manifest/compatible-screens-element.html">{@code +<compatible-screens>}</a> element to manage the distribution of your application based on the +combination of screen size and density. External services such as +Android Market uses this information to apply filtering to your application, so that only devices +that have a screen configuration with which you declare compatibility can download your +application.</p> + +<p>The <a href="{@docRoot}guide/topics/manifest/compatible-screens-element.html">{@code +<compatible-screens>}</a> element must contain one or more {@code <screen>} elements, +which each specify a screen configuration with which your application is compatible, using both +the {@code android:screenSize} and {@code android:screenDensity} attributes. Each {@code +<screen>} element <strong>must include both attributes</strong> to specify an individual +screen configuration—if either attribute is missing, then the element is invalid +(external services such as Android Market will ignore it).</p> + +<p>For example, if your application is compatible with only small and normal screens, regardless +of screen density, then you must specify eight different {@code <screen>} elements, +because each screen size has four density configurations. You must declare each one of +these; any combination of size and density that you do <em>not</em> specify is considered a screen +configuration with which your application is <em>not</em> compatible. Here's what the manifest +entry looks like if your application is compatible with only small and normal screens:</p> + +<pre> +<manifest ... > + ... + <compatible-screens> + <!-- all small size screens --> + <screen android:screenSize="small" android:screenDensity="ldpi" /> + <screen android:screenSize="small" android:screenDensity="mdpi" /> + <screen android:screenSize="small" android:screenDensity="hdpi" /> + <screen android:screenSize="small" android:screenDensity="xhdpi" /> + <!-- all normal size screens --> + <screen android:screenSize="normal" android:screenDensity="ldpi" /> + <screen android:screenSize="normal" android:screenDensity="mdpi" /> + <screen android:screenSize="normal" android:screenDensity="hdpi" /> + <screen android:screenSize="normal" android:screenDensity="xhdpi" /> + </compatible-screens> + <application ... > + ... + <application> +</manifest> +</pre> + +<p class="note"><strong>Note:</strong> Although you can also use the <a +href="{@docRoot}guide/topics/manifest/compatible-screens-element.html">{@code +<compatible-screens>}</a> element for the reverse scenario (when your application is not +compatible with smaller screens), it's easier if you instead use the <a +href="{@docRoot}guide/topics/manifest/supports-screens-element.html">{@code +<supports-screens>}</a> as discussed in the previous section, because it doesn't require you +to specify each screen density your application supports.</p> + +<p>Remember, you should strive to make your application available to as many devices as possible by +applying all necessary techniques for <a +href="{@docRoot}guide/practices/screens_support.html">supporting multiple screens</a>. You should +then use the <a href="{@docRoot}guide/topics/manifest/compatible-screens-element.html">{@code +<compatible-screens>}</a> element to filter your application from certain devices only when you +cannot offer compatibility on all screen configurations or you have decided to provide +multiple versions of your application, each for a different set of screen configurations.</p> + + + +<h2 id="Issues">Other Issues</h2> + +<p>Whether you decide to optimize or upgrade your application for tablet-type devices, you +should be aware that the functionality and availability of your application on new devices +might be affected by the following issues:</p> + +<ul> + <li><a href="#Landscape">Tablets are often designed for use in the landscape orientation</a> + <p>Tablets and similar devices often have a screen that uses the landscape orientation +by default. If your application assumes a portrait orientation or locks into portrait +orientation, you should update your application to support landscape.</p></li> + <li><a href="#Telephony">Not all devices have telephony or other features</a> + <p>If your application declares the {@code "android.hardware.telephony"} feature in the manifest, +then it will not be available to devices that do not offer telephony (such as tablets), based on +Android Market filtering. If your application can function properly without telephony, you should +update your application to gracefully disable the telephony features when not available on a +device.</p></li> +</ul> + + +<h3 id="Landscape">Adding support for landscape screens</h3> + +<p>Although tablets can rotate to operate in any orientation, they are often designed for +landscape orientation and that is how most users will use them. So, you should ensure that your +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" +>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, +consider that tablets and similar devices have a screen that's as tall or taller in landscape +orientation than a phone in portrait orientation. With that in mind, you might be able to add a +landscape design that adds padding or extra landscape scenery on the left and right sides, so +the primary screen space still remains taller than it is wide.</p> + +<p>Ideally, your application should handle all orientation changes instead of locking into one +orientation. When the user rotates the screen, the system restarts the current activity by calling +{@link android.app.Activity#onDestroy onDestroy()} and {@link android.app.Activity#onCreate +onCreate()}) in immediate succession. You should design your activity to account for these changes +in the lifecycle, so the activity can save and restore its state. You can learn about the +necessary lifecycle callback methods and how to save and restore the activity state in the <a +href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">Activities</a> +document. If your activity state is more complex and cannot retain it using the normal +lifecycle callback methods, you can use alternative techniques described in <a +href="{@docRoot}guide/topics/resources/runtime-changes.html">Handling Runtime Changes</a>.</p> + +<p>In the worst-case scenario, however, you can avoid orientation changes by using the <a +href="{@docRoot}guide/topics/manifest/activity-element.html#screen">{@code +android:screenOrientation}</a> attribute in the <a +href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a> +element. Instead of locking the orientation in landscape or portrait, however, you should +specify a value of {@code "nosensor"}. This way, your activity uses whatever orientation the +device specifies as its natural orientation and the screen will not rotate. You should still +avoid using the <a +href="{@docRoot}guide/topics/manifest/activity-element.html#screen">{@code +android:screenOrientation}</a> attribute, but because it's sometimes necessary to lock the +screen into one orientation, it's best if you do so in a way that uses the device's natural +orientation instead of assuming one specific orientation.</p> + +<p>If your application uses the orientation sensors, such as the accelerometer (with the {@link +android.hardware.SensorManager} APIs), also be aware that the landscape screen can also cause +problems, due to false assumptions about which orientation is the natural position. For more +information about how you should properly handle rotation changes when using the orientation +sensors, read the blog post, <a +href="http://android-developers.blogspot.com/2010/09/one-screen-turn-deserves-another.html">One +Screen Turn Deserves Another</a>.</p> + + + +<h3 id="Telephony">Using telephony or other variable features</h3> + +<p>Tablets and similar devices might not include support for telephony, so they can't make +traditional phone calls or handle SMS. Some devices might also omit +other hardware features, such as Bluetooth. If your application uses these features, then your +manifest file probably already includes (or should include) a declaration of the feature with the <a +href="{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code <uses-feature>}</a> +element. Doing so prevents devices that do not declare support for the feature from downloading +your applications. For example:</p> + +<pre><uses-feature android:name="android.hardware.telephony" /></pre> + +<p>By default, this declares that your application <em>requires</em> telephony features. So, +external services such as Android Market use this information to filter your application from +devices that do not offer telephony.</p> + +<p>If, however, your application uses, but does not require the feature, you should +add to this element, {@code android:required="false"}. For example:</p> + +<pre><uses-feature android:name="android.hardware.telephony" android:required="false" /></pre> + +<p>This indicates that your application uses the feature, but is still functional if the feature is +not available. So, it should still be available to devices that don't provide telephony hardware +(or telephony features), such as tablets.</p> + +<p>Then in your application code, you must gracefully disable the features that use telephony +when it's not available. You can check whether the feature is available using {@link +android.content.pm.PackageManager#hasSystemFeature PackageManager.hasSystemFeature()}. For +example:</p> + +<pre> +PackageManager pm = getPackageManager(); +boolean hasTelephony = pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY); +</pre> + +<p>For more information about these +issues and how to future-proof your application for different hardware, read the blog post <a +href="http://android-developers.blogspot.com/2010/10/five-steps-to-future-hardware-happiness.html"> +The Five Steps to Future Hardware Happiness</a>.</p>
\ No newline at end of file diff --git a/docs/html/guide/topics/manifest/compatible-screens-element.jd b/docs/html/guide/topics/manifest/compatible-screens-element.jd index 8669874..5c89869 100644 --- a/docs/html/guide/topics/manifest/compatible-screens-element.jd +++ b/docs/html/guide/topics/manifest/compatible-screens-element.jd @@ -101,6 +101,38 @@ href="{@docRoot}guide/practices/screens_support.html#range">Supporting Multiple </dd> </dl> </dd> + +<dt>example</dt> +<dd> +<p>If your application is compatible with only small and normal screens, regardless +of screen density, then you must specify eight different {@code <screen>} elements, +because each screen size has four different density configurations. You must declare each one of +these; any combination of size and density that you do <em>not</em> specify is considered a screen +configuration with which your application is <em>not</em> compatible. Here's what the manifest +entry looks like if your application is compatible with only small and normal screens:</p> + +<pre> +<manifest ... > + ... + <compatible-screens> + <!-- all small size screens --> + <screen android:screenSize="small" android:screenDensity="ldpi" /> + <screen android:screenSize="small" android:screenDensity="mdpi" /> + <screen android:screenSize="small" android:screenDensity="hdpi" /> + <screen android:screenSize="small" android:screenDensity="xhdpi" /> + <!-- all normal size screens --> + <screen android:screenSize="normal" android:screenDensity="ldpi" /> + <screen android:screenSize="normal" android:screenDensity="mdpi" /> + <screen android:screenSize="normal" android:screenDensity="hdpi" /> + <screen android:screenSize="normal" android:screenDensity="xhdpi" /> + </compatible-screens> + <application ... > + ... + <application> +</manifest> +</pre> +</dd> + <dt>introduced in:</dt> <dd>API Level 9</dd> <dt>see also:</dt> diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd index 60030f0..1583dee 100644 --- a/docs/html/guide/topics/resources/providing-resources.jd +++ b/docs/html/guide/topics/resources/providing-resources.jd @@ -596,7 +596,7 @@ orientation" described above.</p> </tr> --> <tr id="VersionQualifier"> - <td>System Version (API Level)</td> + <td>Platform Version (API Level)</td> <td>Examples:<br/> <code>v3</code><br/> <code>v4</code><br/> @@ -609,7 +609,7 @@ orientation" described above.</p> href="{@docRoot}guide/appendix/api-levels.html">Android API Levels</a> document for more information about these values.</p> <p class="caution"><strong>Caution:</strong> Android 1.5 and 1.6 only match resources -with this qualifier when it exactly matches the system version. See the section below about <a +with this qualifier when it exactly matches the platform version. See the section below about <a href="#KnownIssues">Known Issues</a> for more information.</p> </td> </tr> @@ -975,7 +975,7 @@ href="accessing-resources.html">Accessing Resources</a>.</p> <p>The correct behavior is for the system to match resources marked with a <a href="#VersionQualifier">version qualifier</a> equal -to or less than the system version on the device, but on Android 1.5 and 1.6, (API Level 3 and 4), +to or less than the platform version on the device, but on Android 1.5 and 1.6, (API Level 3 and 4), there is a bug that causes the system to match resources marked with the version qualifier only when it exactly matches the version on the device.</p> diff --git a/docs/html/guide/topics/search/adding-custom-suggestions.jd b/docs/html/guide/topics/search/adding-custom-suggestions.jd index c8f06b9..02ee084 100644 --- a/docs/html/guide/topics/search/adding-custom-suggestions.jd +++ b/docs/html/guide/topics/search/adding-custom-suggestions.jd @@ -17,8 +17,8 @@ parent.link=index.html </li> <li><a href="#IntentForSuggestions">Declaring an Intent for Suggestions</a> <ol> - <li><a href="#IntentAction">Declaring the Intent action</a></li> - <li><a href="#IntentData">Declaring the Intent data</a></li> + <li><a href="#IntentAction">Declaring the intent action</a></li> + <li><a href="#IntentData">Declaring the intent data</a></li> </ol> </li> <li><a href="#HandlingIntent">Handling the Intent</a></li> @@ -47,8 +47,8 @@ Dictionary</a></li> </div> </div> -<p>When using the Android search dialog, you can provide custom search suggestions that are -created from data in your application. For example, if your application is a word +<p>When using the Android search dialog or search widget, you can provide custom search suggestions +that are created from data in your application. For example, if your application is a word dictionary, you can suggest words from the dictionary that match the text entered so far. These are the most valuable suggestions, because you can effectively predict what the user wants and provide instant access to it. Figure 1 shows @@ -58,9 +58,8 @@ an example of a search dialog with custom suggestions.</p> Search Box, providing access to your content from outside your application.</p> <p>Before you begin with this guide to add custom suggestions, you need to have implemented the -Android search dialog for searches in your -application. If you haven't, see <a href="search-dialog.html">Using the Android Search -Dialog</a>.</p> +Android search dialog or a search widget for searches in your +application. If you haven't, see <a href="search-dialog.html">Creating a Search Interface</a>.</p> <h2 id="TheBasics">The Basics</h2> @@ -71,11 +70,11 @@ Dialog</a>.</p> search suggestions.</p> </div> -<p>When the user selects a custom suggestion, the Search Manager sends an {@link +<p>When the user selects a custom suggestion, the Android system sends an {@link android.content.Intent} to -your searchable Activity. Whereas a normal search query sends an Intent with the {@link +your searchable activity. Whereas a normal search query sends an intent with the {@link android.content.Intent#ACTION_SEARCH} action, you can instead define your custom suggestions to use -{@link android.content.Intent#ACTION_VIEW} (or any other Intent action), and also include data +{@link android.content.Intent#ACTION_VIEW} (or any other intent action), and also include data that's relevant to the selected suggestion. Continuing the dictionary example, when the user selects a suggestion, your application can immediately open the definition for that word, instead of searching the dictionary for matches.</p> @@ -83,8 +82,8 @@ open the definition for that word, instead of searching the dictionary for match <p>To provide custom suggestions, do the following:</p> <ul> - <li>Implement a basic searchable Activity, as described in <a -href="search-dialog.html">Using the Android Search Dialog</a>.</li> + <li>Implement a basic searchable activity, as described in <a +href="search-dialog.html">Creating a Search Interface</a>.</li> <li>Modify the searchable configuration with information about the content provider that provides custom suggestions.</li> <li>Build a table (such as in an {@link android.database.sqlite.SQLiteDatabase}) for your @@ -96,22 +95,21 @@ in your manifest.</li> suggestion (including a custom action and custom data). </li> </ul> -<p>Just like the Search Manager displays the search dialog, it also displays your search -suggestions. All you need is a content provider from which the Search Manager can retrieve your +<p>Just as the Android system displays the search dialog, it also displays your search +suggestions. All you need is a content provider from which the system can retrieve your suggestions. If you're not familiar with creating content providers, read the <a href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a> developer guide before you continue.</p> -<p>When the Search Manager identifies that your Activity is searchable and provides search -suggestions, the following procedure takes place as soon as the user enters text into the -search dialog:</p> +<p>When the system identifies that your activity is searchable and provides search +suggestions, the following procedure takes place when the user types a query:</p> <ol> - <li>Search Manager takes the search query text (whatever has been typed so far) and performs a + <li>The system takes the search query text (whatever has been typed so far) and performs a query to your content provider that manages your suggestions.</li> <li>Your content provider returns a {@link android.database.Cursor} that points to all suggestions that are relevant to the search query text.</li> - <li>Search Manager displays the list of suggestions provided by the Cursor.</li> + <li>The system displays the list of suggestions provided by the Cursor.</li> </ol> <p>Once the custom suggestions are displayed, the following might happen:</p> @@ -120,9 +118,9 @@ suggestions that are relevant to the search query text.</li> <li>If the user types another key, or changes the query in any way, the above steps are repeated and the suggestion list is updated as appropriate. </li> <li>If the user executes the search, the suggestions are ignored and the search is delivered -to your searchable Activity using the normal {@link android.content.Intent#ACTION_SEARCH} -Intent.</li> - <li>If the user selects a suggestion, an Intent is sent to your searchable Activity, carrying a +to your searchable activity using the normal {@link android.content.Intent#ACTION_SEARCH} +intent.</li> + <li>If the user selects a suggestion, an intent is sent to your searchable activity, carrying a custom action and custom data so that your application can open the suggested content.</li> </ul> @@ -142,7 +140,7 @@ to the {@code <searchable>} element in your searchable configuration file. </searchable> </pre> -<p>You might need some additional attributes, depending on the type of Intent you attach +<p>You might need some additional attributes, depending on the type of intent you attach to each suggestion and how you want to format queries to your content provider. The other optional attributes are discussed in the following sections.</p> @@ -155,11 +153,11 @@ providers that's covered in the <a href="{@docRoot}guide/topics/providers/content-providers.html">Content Provider</a> developer guide. For the most part, a content provider for custom suggestions is the same as any other content provider. However, for each suggestion you provide, the respective row in -the {@link android.database.Cursor} must include specific columns that the Search Manager +the {@link android.database.Cursor} must include specific columns that the system understands and uses to format the suggestions.</p> -<p>When the user starts typing into the search dialog, the Search Manager queries your content -provider for suggestions by calling {@link +<p>When the user starts typing into the search dialog or search widget, the system queries +your content provider for suggestions by calling {@link android.content.ContentProvider#query(Uri,String[],String,String[],String) query()} each time a letter is typed. In your implementation of {@link android.content.ContentProvider#query(Uri,String[],String,String[],String) query()}, your @@ -170,22 +168,22 @@ android.database.Cursor} that points to the rows you have determined to be good two sections:</p> <dl> <dt><a href="#HandlingSuggestionQuery">Handling the suggestion query</a></dt> - <dd>How the Search Manager sends requests to your content provider and how to handle them</dd> + <dd>How the system sends requests to your content provider and how to handle them</dd> <dt><a href="#SuggestionTable">Building a suggestion table</a></dt> - <dd>How to define the columns that the Search Manager expects in the {@link + <dd>How to define the columns that the system expects in the {@link android.database.Cursor} returned with each query</dd> </dl> <h3 id="HandlingSuggestionQuery">Handling the suggestion query</h3> -<p>When the Search Manager requests suggestions from your content provider, it calls your content +<p>When the system requests suggestions from your content provider, it calls your content provider's {@link android.content.ContentProvider#query(Uri,String[],String,String[],String) query()} method. You must implement this method to search your suggestion data and return a {@link android.database.Cursor} pointing to the suggestions you deem relevant.</p> -<p>Here's a summary of the parameters that the Search Manager passes to your {@link +<p>Here's a summary of the parameters that the system passes to your {@link android.content.ContentProvider#query(Uri,String[],String,String[],String) query()} method (listed in order):</p> @@ -196,7 +194,7 @@ android.content.ContentProvider#query(Uri,String[],String,String[],String) query content://<em>your.authority</em>/<em>optional.suggest.path</em>/<em>{@link android.app.SearchManager#SUGGEST_URI_PATH_QUERY}</em> </pre> -<p>The default behavior is for Search Manager to pass this URI and append it with the query text. +<p>The default behavior is for system to pass this URI and append it with the query text. For example:</p> <pre class="no-pretty-print"> content://<em>your.authority</em>/<em>optional.suggest.path</em>/<em>{@link @@ -233,7 +231,7 @@ about using this to <a href="#GetTheQuery">get the query</a> below.</dd> <dd>Always null</dd> </dl> -<p>The Search Manager can send you the search query text in two ways. The +<p>The system can send you the search query text in two ways. The default manner is for the query text to be included as the last path of the content URI passed in the {@code uri} parameter. However, if you include a selection value in your searchable configuration's {@code @@ -251,8 +249,8 @@ parameter (a {@link android.net.Uri} object). To retrieve the query text in this String query = uri.getLastPathSegment().toLowerCase(); </pre> -<p>This returns the last segment of the {@link android.net.Uri}, which is the query text entered in -the search dialog.</p> +<p>This returns the last segment of the {@link android.net.Uri}, which is the query text entered +by the user.</p> @@ -264,7 +262,7 @@ receive everything it needs to perform the look-up and you want the {@code selection} and {@code selectionArgs} parameters to carry the appropriate values. In such a case, add the {@code android:searchSuggestSelection} attribute to your searchable configuration with your SQLite selection string. In the selection string, include a question mark ("?") as -a placeholder for the actual search query. The Search Manager calls {@link +a placeholder for the actual search query. The system calls {@link android.content.ContentProvider#query(Uri,String[],String,String[],String) query()} with the selection string as the {@code selection} parameter and the search query as the first element in the {@code selectionArgs} array.</p> @@ -278,15 +276,15 @@ create a full-text search statement:</p> android:label="@string/app_label" android:hint="@string/search_hint" android:searchSuggestAuthority="com.example.MyCustomSuggestionProvider" - android:searchSuggestIntentAction="android.Intent.action.VIEW" + android:searchSuggestIntentAction="android.intent.action.VIEW" <b>android:searchSuggestSelection="word MATCH ?"</b>> </searchable> </pre> <p>With this configuration, your {@link android.content.ContentProvider#query(Uri,String[],String,String[],String) query()} method -delivers the {@code selection} parameter as "word MATCH ?" and the {@code selectionArgs} -parameter as whatever the user entered in the search dialog. When you pass these to an SQLite +delivers the {@code selection} parameter as {@code "word MATCH ?"} and the {@code selectionArgs} +parameter as the search query. When you pass these to an SQLite {@link android.database.sqlite.SQLiteDatabase#query(String,String[],String,String[],String,String, String) query()} method, as their respective arguments, they are synthesized together (the question mark is replaced with the query @@ -296,9 +294,9 @@ parameter, because this value is wrapped in quotes and inserted in place of the question mark.</p> <p>Another new attribute in the example above is {@code android:searchSuggestIntentAction}, which -defines the Intent action sent with each Intent when the user selects a suggestion. It is +defines the intent action sent with each intent when the user selects a suggestion. It is discussed further in the section about <a href="#IntentForSuggestions">Declaring an Intent for -suggestions</a>.</p> +Suggestions</a>.</p> <p class="note"><strong>Tip:</strong> If you don't want to define a selection clause in the {@code android:searchSuggestSelection} attribute, but would still like to receive the query @@ -317,7 +315,7 @@ handle it.</p> <h2>Creating a Cursor without a table</h2> <p>If your search suggestions are not stored in a table format (such as an SQLite table) using the columns required by the -Search Manager, then you can search your suggestion data for matches and then format them +system, then you can search your suggestion data for matches and then format them into the necessary table on each request. To do so, create a {@link android.database.MatrixCursor} using the required column names and then add a row for each suggestion using {@link android.database.MatrixCursor#addRow(Object[])}. Return the final product from your Content @@ -326,18 +324,18 @@ android.content.ContentProvider#query(Uri,String[],String,String[],String) query </div> </div> -<p>When you return suggestions to the Search Manager with a {@link android.database.Cursor}, the -Search Manager expects specific columns in each row. So, regardless of whether you +<p>When you return suggestions to the system with a {@link android.database.Cursor}, the +system expects specific columns in each row. So, regardless of whether you decide to store your suggestion data in an SQLite database on the device, a database on a web server, or another format on the device or web, you must format the suggestions as rows in a table and -present them with a {@link android.database.Cursor}. The Search -Manager understands several columns, but only two are required:</p> +present them with a {@link android.database.Cursor}. The system understands several columns, but +only two are required:</p> <dl> <dt>{@link android.provider.BaseColumns#_ID}</dt> - <dd>A unique integer row ID for each suggestion. The search dialog requires this in order -to present suggestions in a ListView.</dd> + <dd>A unique integer row ID for each suggestion. The system requires this in order +to present suggestions in a {@link android.widget.ListView}.</dd> <dt>{@link android.app.SearchManager#SUGGEST_COLUMN_TEXT_1}</dt> <dd>The string that is presented as a suggestion.</dd> </dl> @@ -359,35 +357,35 @@ This can be null or zero to indicate no icon in this row.</dd> all suggestions are provided in an icon-plus-text format with the icon on the right side. This can be null or zero to indicate no icon in this row.</dd> <dt>{@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_ACTION}</dt> - <dd>An Intent action string. If this column exists and contains a value at the given row, the -action defined here is used when forming the suggestion's Intent. If the element is not + <dd>An intent action string. If this column exists and contains a value at the given row, the +action defined here is used when forming the suggestion's intent. If the element is not provided, the action is taken from the {@code android:searchSuggestIntentAction} field in your searchable configuration. If your action is the same for all suggestions, it is more efficient to specify the action using {@code android:searchSuggestIntentAction} and omit this column.</dd> <dt>{@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_DATA}</dt> <dd>A data URI string. If this column exists and contains a value at the given row, this is the -data that is used when forming the suggestion's Intent. If the element is not provided, the data is +data that is used when forming the suggestion's intent. If the element is not provided, the data is taken from the {@code android:searchSuggestIntentData} field in your searchable configuration. If neither source is provided, -the Intent's data field is null. If your data is the same for all suggestions, or can be +the intent's data field is null. If your data is the same for all suggestions, or can be described using a constant part and a specific ID, it is more efficient to specify it using {@code android:searchSuggestIntentData} and omit this column. </dd> <dt>{@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_DATA_ID}</dt> <dd>A URI path string. If this column exists and contains a value at the given row, then "/" and -this value is appended to the data field in the Intent. This should only be used if the data field +this value is appended to the data field in the intent. This should only be used if the data field specified by the {@code android:searchSuggestIntentData} attribute in the searchable configuration has already been set to an appropriate base string.</dd> <dt>{@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_EXTRA_DATA}</dt> <dd>Arbitrary data. If this column exists and contains a value at a given row, this is the -<em>extra</em> data used when forming the suggestion's Intent. If not provided, the -Intent's extra data field is null. This column allows suggestions to provide additional data that is -included as an extra in the Intent's {@link android.app.SearchManager#EXTRA_DATA_KEY} key.</dd> +<em>extra</em> data used when forming the suggestion's intent. If not provided, the +intent's extra data field is null. This column allows suggestions to provide additional data that is +included as an extra in the intent's {@link android.app.SearchManager#EXTRA_DATA_KEY} key.</dd> <dt>{@link android.app.SearchManager#SUGGEST_COLUMN_QUERY}</dt> <dd>If this column exists and this element exists at the given row, this is the data that is -used when forming the suggestion's query, included as an extra in the Intent's {@link +used when forming the suggestion's query, included as an extra in the intent's {@link android.app.SearchManager#QUERY} key. Required if suggestion's action is {@link android.content.Intent#ACTION_SEARCH}, optional otherwise.</dd> <dt>{@link android.app.SearchManager#SUGGEST_COLUMN_SHORTCUT_ID}</dt> @@ -410,22 +408,22 @@ while the shortcut of this suggestion is being refreshed in Quick Search Box.</d -<h2 id="IntentForSuggestions">Declaring an Intent for suggestions</h2> +<h2 id="IntentForSuggestions">Declaring an Intent for Suggestions</h2> -<p>When the user selects a suggestion from the list that appears below the search dialog, the Search -Manager sends a custom {@link android.content.Intent} to your searchable Activity. You must define -the action and data for the Intent.</p> +<p>When the user selects a suggestion from the list that appears below the search dialog or widget, +the system sends a custom {@link android.content.Intent} to your searchable activity. You +must define the action and data for the intent.</p> -<h3 id="IntentAction">Declaring the Intent action</h3> +<h3 id="IntentAction">Declaring the intent action</h3> -<p>The most common Intent action for a custom suggestion is {@link +<p>The most common intent action for a custom suggestion is {@link android.content.Intent#ACTION_VIEW}, which is appropriate when you want to open something, like the definition for a word, a person's contact information, or a web -page. However, the Intent action can be any other action and can even be different for each +page. However, the intent action can be any other action and can even be different for each suggestion.</p> -<p>Depending on whether you want all suggestions to use the same Intent action, you +<p>Depending on whether you want all suggestions to use the same intent action, you can define the action in two ways:</p> <ol type="a"> @@ -457,34 +455,34 @@ android:searchSuggestIntentAction} attribute with an action to be used with all default, then override this action for some suggestions by declaring a different action in the {@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_ACTION} column. If you do not include a value in the {@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_ACTION} column, then the -Intent provided in the {@code android:searchSuggestIntentAction} attribute is used.</p> +intent provided in the {@code android:searchSuggestIntentAction} attribute is used.</p> <p class="note"><strong>Note</strong>: If you do not include the {@code android:searchSuggestIntentAction} attribute in your searchable configuration, then you <em>must</em> include a value in the {@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_ACTION} -column for every suggestion, or the Intent will fail.</p> +column for every suggestion, or the intent will fail.</p> -<h3 id="IntentData">Declaring Intent data</h3> +<h3 id="IntentData">Declaring intent data</h3> -<p>When the user selects a suggestion, your searchable Activity receives the Intent with the -action you've defined (as discussed in the previous section), but the Intent must also carry -data in order for your Activity to identify which suggestion was selected. Specifically, +<p>When the user selects a suggestion, your searchable activity receives the intent with the +action you've defined (as discussed in the previous section), but the intent must also carry +data in order for your activity to identify which suggestion was selected. Specifically, the data should be something unique for each suggestion, such as the row ID for the suggestion in -your SQLite table. When the Intent is received, +your SQLite table. When the intent is received, you can retrieve the attached data with {@link android.content.Intent#getData()} or {@link android.content.Intent#getDataString()}.</p> -<p>You can define the data included with the Intent in two ways:</p> +<p>You can define the data included with the intent in two ways:</p> <ol type="a"> <li>Define the data for each suggestion inside the {@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_DATA} column of your suggestions table. -<p>Provide all necessary data information for each Intent in the suggestions table by including the +<p>Provide all necessary data information for each intent in the suggestions table by including the {@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_DATA} column and then populating it with -unique data for each row. The data from this column is attached to the Intent exactly as you +unique data for each row. The data from this column is attached to the intent exactly as you define it in this column. You can then retrieve it with with {@link android.content.Intent#getData()} or {@link android.content.Intent#getDataString()}.</p> @@ -498,7 +496,7 @@ projection map of column names to aliases.</p> </li> <li>Fragment a data URI into two pieces: the portion common to all suggestions and the portion -unique to each suggestion. Place these parts into the {@code android:searchSuggestIntentData} +unique to each suggestion. Place these parts into the {@code android:searchSuggestintentData} attribute of the searchable configuration and the {@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_DATA_ID} column of your suggestions table, respectively. @@ -512,14 +510,14 @@ android:searchSuggestIntentData} attribute of your searchable configuration. For android:label="@string/app_label" android:hint="@string/search_hint" android:searchSuggestAuthority="com.example.MyCustomSuggestionProvider" - android:searchSuggestIntentAction="android.Intent.action.VIEW" + android:searchSuggestIntentAction="android.intent.action.VIEW" <b>android:searchSuggestIntentData="content://com.example/datatable"</b> > </searchable> </pre> <p>Then include the final path for each suggestion (the unique part) in the {@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_DATA_ID} -column of your suggestions table. When the user selects a suggestion, the Search Manager takes +column of your suggestions table. When the user selects a suggestion, the system takes the string from {@code android:searchSuggestIntentData}, appends a slash ("/") and then adds the respective value from the {@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_DATA_ID} column to form a complete content URI. You can then retrieve the {@link android.net.Uri} with with {@link @@ -530,20 +528,20 @@ android.content.Intent#getData()}.</p> <h4>Add more data</h4> -<p>If you need to express even more information with your Intent, you can add another table column, +<p>If you need to express even more information with your intent, you can add another table column, {@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_EXTRA_DATA}, which can store additional information about the suggestion. The data saved in this column is placed in {@link -android.app.SearchManager#EXTRA_DATA_KEY} of the Intent's extra Bundle.</p> +android.app.SearchManager#EXTRA_DATA_KEY} of the intent's extra Bundle.</p> <h2 id="HandlingIntent">Handling the Intent</h2> -<p>Now that your search dialog provides custom search suggestions with custom Intents, you -need your searchable Activity to handle these Intents when the user selects a +<p>Now that you provide custom search suggestions with custom intents, you +need your searchable activity to handle these intents when the user selects a suggestion. This is in addition to handling the {@link -android.content.Intent#ACTION_SEARCH} Intent, which your searchable Activity already does. -Here's an example of how you can handle the Intents during your Activity {@link +android.content.Intent#ACTION_SEARCH} intent, which your searchable activity already does. +Here's an example of how you can handle the intents during your activity {@link android.app.Activity#onCreate(Bundle) onCreate()} callback:</p> <pre> @@ -559,25 +557,25 @@ if (Intent.ACTION_SEARCH.equals(intent.getAction())) { } </pre> -<p>In this example, the Intent action is {@link +<p>In this example, the intent action is {@link android.content.Intent#ACTION_VIEW} and the data carries a complete URI pointing to the suggested item, as synthesized by the {@code android:searchSuggestIntentData} string and {@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_DATA_ID} column. The URI is then passed to the local {@code showResult()} method that queries the content provider for the item specified by the URI.</p> -<p class="note"><strong>Note:</strong> You do <em>not</em> need to add an Intent filter to your -Android manifest file for the Intent action you defined with the {@code +<p class="note"><strong>Note:</strong> You do <em>not</em> need to add an intent filter to your +Android manifest file for the intent action you defined with the {@code android:searchSuggestIntentAction} attribute or {@link -android.app.SearchManager#SUGGEST_COLUMN_INTENT_ACTION} column. The Search Manager opens your -searchable Activity by name to deliver the suggestion's Intent, so the Activity does not need to +android.app.SearchManager#SUGGEST_COLUMN_INTENT_ACTION} column. The system opens your +searchable activity by name to deliver the suggestion's intent, so the activity does not need to declare the accepted action.</p> <h2 id="RewritingQueryText">Rewriting the query text</h2> -<p>If the user navigates through the suggestions list using the directional controls (trackball or -d-pad), the text in the search dialog won't change, by default. However, you can temporarily rewrite -the user's query text as it appears in the text box with +<p>If the user navigates through the suggestions list using the directional controls (such +as with a trackball or d-pad), the query text does not update, by default. However, you +can temporarily rewrite the user's query text as it appears in the text box with a query that matches the suggestion currently in focus. This enables the user to see what query is being suggested (if appropriate) and then select the search box and edit the query before dispatching it as a search.</p> @@ -654,7 +652,7 @@ android:searchSettingsDescription} attribute to your searchable configuration. F android:label="@string/app_label" android:hint="@string/search_hint" android:searchSuggestAuthority="com.example.MyCustomSuggestionProvider" - android:searchSuggestIntentAction="android.Intent.action.VIEW" + android:searchSuggestIntentAction="android.intent.action.VIEW" android:includeInGlobalSearch="true" <b>android:searchSettingsDescription="@string/search_description"</b> > </searchable> @@ -676,7 +674,7 @@ them how to enable search suggestions for Quick Search Box.</p> <h3 id="ManagingShortcuts">Managing Quick Search Box suggestion shortcuts</h3> <p>Suggestions that the user selects from Quick Search Box can be automatically made into shortcuts. -These are suggestions that the Search Manager has copied from your content provider so it can +These are suggestions that the system has copied from your content provider so it can quickly access the suggestion without the need to re-query your content provider. </p> <p>By default, this is enabled for all suggestions retrieved by Quick Search Box, but if your diff --git a/docs/html/guide/topics/search/adding-recent-query-suggestions.jd b/docs/html/guide/topics/search/adding-recent-query-suggestions.jd index cb063a1..2c9a461 100644 --- a/docs/html/guide/topics/search/adding-recent-query-suggestions.jd +++ b/docs/html/guide/topics/search/adding-recent-query-suggestions.jd @@ -28,13 +28,15 @@ Configuration</a></li> </div> </div> -<p>When using the Android search dialog, you can provide search suggestions based on recent search +<p>When using the Android search dialog or search widget, you can provide search suggestions based +on recent search queries. For example, if a user previously searched for "puppies," then that query appears as a suggestion once he or she begins typing the same query. Figure 1 shows an example of a search dialog with recent query suggestions.</p> -<p>Before you begin, you need to implement the search dialog for basic searches in your application. -If you haven't, see <a href="search-dialog.html">Using the Android Search Dialog</a>.</p> +<p>Before you begin, you need to implement the search dialog or a search widget for basic searches +in your application. +If you haven't, see <a href="search-dialog.html">Creating a Search Interface</a>.</p> @@ -47,16 +49,16 @@ suggestions.</p> </div> <p>Recent query suggestions are simply saved searches. When the user selects one of -the suggestions, your searchable Activity receives a {@link -android.content.Intent#ACTION_SEARCH} Intent with the suggestion as the search query, which your -searchable Activity already handles (as described in <a href="search-dialog.html">Using the Android -Search Dialog</a>).</p> +the suggestions, your searchable activity receives a {@link +android.content.Intent#ACTION_SEARCH} intent with the suggestion as the search query, which your +searchable activity already handles (as described in <a href="search-dialog.html">Creating a Search +Interface</a>).</p> <p>To provide recent queries suggestions, you need to:</p> <ul> - <li>Implement a searchable Activity, <a -href="{@docRoot}guide/topics/search/search-dialog.html">using the Android Search Dialog</a>.</li> + <li>Implement a searchable activity, as described in <a +href="{@docRoot}guide/topics/search/search-dialog.html">Creating a Search Interface</a>.</li> <li>Create a content provider that extends {@link android.content.SearchRecentSuggestionsProvider} and declare it in your application manifest.</li> <li>Modify the searchable configuration with information about the content provider that @@ -64,20 +66,19 @@ provides search suggestions.</li> <li>Save queries to your content provider each time a search is executed.</li> </ul> -<p>Just as the Search Manager displays the search dialog, it also displays the -search suggestions. All you need to do is provide a source from which the suggestions can be -retrieved.</p> +<p>Just as the Android system displays the search dialog, it also displays the +search suggestions below the dialog or search widget. All you need to do is provide a source from +which the system can retrieve suggestions.</p> -<p>When the Search Manager identifies that your Activity is searchable and provides search -suggestions, the following procedure takes place as soon as the user types into the search -dialog:</p> +<p>When the system identifies that your activity is searchable and provides search +suggestions, the following procedure takes place as soon as the user begins typing a query:</p> <ol> - <li>Search Manager takes the search query text (whatever has been typed so far) and performs a + <li>The system takes the search query text (whatever has been typed so far) and performs a query to the content provider that contains your suggestions.</li> <li>Your content provider returns a {@link android.database.Cursor} that points to all suggestions that match the search query text.</li> - <li>Search Manager displays the list of suggestions provided by the Cursor.</li> + <li>The system displays the list of suggestions provided by the Cursor.</li> </ol> <p>Once the recent query suggestions are displayed, the following might happen:</p> @@ -86,10 +87,10 @@ suggestions that match the search query text.</li> <li>If the user types another key, or changes the query in any way, the aforementioned steps are repeated and the suggestion list is updated.</li> <li>If the user executes the search, the suggestions are ignored and the search is delivered -to your searchable Activity using the normal {@link android.content.Intent#ACTION_SEARCH} -Intent.</li> +to your searchable activity using the normal {@link android.content.Intent#ACTION_SEARCH} +intent.</li> <li>If the user selects a suggestion, an -{@link android.content.Intent#ACTION_SEARCH} Intent is delivered to your searchable Activity using +{@link android.content.Intent#ACTION_SEARCH} intent is delivered to your searchable activity using the suggested text as the query.</li> </ul> @@ -151,7 +152,7 @@ searchable configuration). For example:</p> <h2 id="RecentQuerySearchableConfiguration">Modifying the Searchable Configuration</h2> -<p>To configure your search dialog to use your suggestions provider, you need to add +<p>To configure the system to use your suggestions provider, you need to add the {@code android:searchSuggestAuthority} and {@code android:searchSuggestSelection} attributes to the {@code <searchable>} element in your searchable configuration file. For example:</p> @@ -179,12 +180,12 @@ automatically replaced by the query text entered by the user).</p> <h2 id="SavingQueries">Saving Queries</h2> <p>To populate your collection of recent queries, add each query -received by your searchable Activity to your {@link +received by your searchable activity to your {@link android.content.SearchRecentSuggestionsProvider}. To do this, create an instance of {@link android.provider.SearchRecentSuggestions} and call {@link android.provider.SearchRecentSuggestions#saveRecentQuery(String,String) saveRecentQuery()} each time -your searchable Activity receives a query. For example, here's how you can save the query during -your Activity's {@link android.app.Activity#onCreate(Bundle) onCreate()} method:</p> +your searchable activity receives a query. For example, here's how you can save the query during +your activity's {@link android.app.Activity#onCreate(Bundle) onCreate()} method:</p> <pre> @Override @@ -192,10 +193,10 @@ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.main); - Intent Intent = getIntent(); + Intent intent = getIntent(); - if (Intent.ACTION_SEARCH.equals(Intent .getAction())) { - String query = Intent .getStringExtra(SearchManager.QUERY); + if (Intent.ACTION_SEARCH.equals(intent.getAction())) { + String query = intent.getStringExtra(SearchManager.QUERY); SearchRecentSuggestions suggestions = new SearchRecentSuggestions(this, MySuggestionProvider.AUTHORITY, MySuggestionProvider.MODE); suggestions.saveRecentQuery(query, null); @@ -212,7 +213,7 @@ the search query string as the first parameter and, optionally, a second string second line of the suggestion (or null). The second parameter is only used if you've enabled two-line mode for the search suggestions with {@link android.content.SearchRecentSuggestionsProvider#DATABASE_MODE_2LINES}. If you have enabled -two-line mode, then the query text is also matched against this second line when the Search Manager +two-line mode, then the query text is also matched against this second line when the system looks for matching suggestions.</p> diff --git a/docs/html/guide/topics/search/index.jd b/docs/html/guide/topics/search/index.jd index f563715..7ac5ff1 100644 --- a/docs/html/guide/topics/search/index.jd +++ b/docs/html/guide/topics/search/index.jd @@ -5,7 +5,7 @@ page.title=Search <div id="qv"> <h2>Topics</h2> <ol> -<li><a href="search-dialog.html">Using the Android Search Dialog</a></li> +<li><a href="search-dialog.html">Creating a Search Interface</a></li> <li><a href="adding-recent-query-suggestions.html">Adding Recent Query Suggestions</a></li> <li><a href="adding-custom-suggestions.html">Adding Custom Suggestions</a></li> </ol> @@ -24,9 +24,8 @@ Dictionary</a></li> <p>Search is a core user feature on Android. Users should be able to search any data that is available to them, whether the content is located on the device or -the Internet. The search experience should be seamless and consistent across the entire -system, which is why Android provides a search framework to help you provide users with -a familiar search dialog and a great search experience.</p> +the Internet. To help create a consistent search experience for users, Android provides a +search framework that helps you implement search for your application.</p> <div class="figure" style="width:250px"> <img src="{@docRoot}images/search/search-suggest-custom.png" alt="" height="417" /> @@ -34,16 +33,14 @@ a familiar search dialog and a great search experience.</p> search suggestions.</p> </div> -<p>Android's search framework provides a user interface in which users can perform a search and -an interaction layer that communicates with your application, so you don't have to build -your own search Activity. Instead, a search dialog appears at the top of the screen at the user's -command without interrupting the current Activity.</p> +<p>The search framework offers two modes of search input: a search dialog at the top of the +screen or a search widget ({@link android.widget.SearchView}) that you can embed in your activity +layout. In either case, the Android system will assist your search implementation by +delivering search queries to a specific activity that performs searchs. You can also enable either +the search dialog or widget to provide search suggestions as the user types. Figure 1 shows an +example of the search dialog with optional search suggestions.</p> -<p>The search framework manages the life of the search dialog. When users execute a search, the -search framework passes the query text to your application so your application can perform a -search. Figure 1 shows an example of the search dialog with optional search suggestions.</p> - -<p>Once your application is set up to use the search dialog, you can:</p> +<p>Once you've set up either the search dialog or the search widget, you can:</p> <ul> <li>Enable voice search</li> @@ -57,19 +54,19 @@ search your data. To perform a search, you need to use APIs appropriate for your if your data is stored in an SQLite database, you should use the {@link android.database.sqlite} APIs to perform searches.</p> -<p>The following documents show you how to use the search dialog in your application:</p> +<p>The following documents show you how to use Android's framework to implement search:</p> <dl> - <dt><strong><a href="search-dialog.html">Using the Android Search Dialog</a></strong></dt> - <dd>How to set up your application to use the search dialog. </dd> + <dt><strong><a href="search-dialog.html">Creating a Search Interface</a></strong></dt> + <dd>How to set up your application to use the search dialog or search widget. </dd> <dt><strong><a href="adding-recent-query-suggestions.html">Adding Recent Query Suggestions</a></strong></dt> - <dd>How to show suggestions based on queries previously used in the search dialog.</dd> + <dd>How to provide suggestions based on queries previously used.</dd> <dt><strong><a href="adding-custom-suggestions.html">Adding Custom Suggestions</a></strong></dt> - <dd>How to show suggestions based on custom data from your application and offer your suggestions + <dd>How to provide suggestions based on custom data from your application and also offer them in the system-wide Quick Search Box.</dd> <dt><strong><a href="searchable-config.html">Searchable Configuration</a></strong></dt> - <dd>A reference for the searchable configuration file (though the other + <dd>A reference document for the searchable configuration file (though the other documents also discuss the configuration file in terms of specific behaviors).</dd> </dl> @@ -92,17 +89,17 @@ you don't need to send the user ID as well; send only the zip code to the server send the personal information, you should not log it. If you must log it, protect that data very carefully and erase it as soon as possible.</p> </li> -<li><strong>Provide the user with a way to clear their search history.</strong> +<li><strong>Provide users with a way to clear their search history.</strong> <p>The search framework helps your application provide context-specific suggestions while the user types. Sometimes these suggestions are based on previous searches or other actions taken by the user in an earlier session. A user might not wish for previous searches to be revealed to other device users, for -instance, if they share their phone with a friend. If your application provides suggestions that can -reveal previous activities, you should implement the ability for the user to clear the search -history. If you are using {@link android.provider.SearchRecentSuggestions}, you can simply call the -{@link android.provider.SearchRecentSuggestions#clearHistory()} method. If you are implementing -custom suggestions, you'll need to provide a similar "clear history" method in your provider that -the user can execute.</p> +instance, if the user shares the device with a friend. If your application provides suggestions that +can reveal previous search activities, you should implement the ability for the user to clear the +search history. If you are using {@link android.provider.SearchRecentSuggestions}, you can simply +call the {@link android.provider.SearchRecentSuggestions#clearHistory()} method. If you are +implementing custom suggestions, you'll need to provide a similar "clear history" method in your +content provider that the user can execute.</p> </li> </ul> diff --git a/docs/html/guide/topics/search/search-dialog.jd b/docs/html/guide/topics/search/search-dialog.jd index 6699fe1..af6c8f2 100644 --- a/docs/html/guide/topics/search/search-dialog.jd +++ b/docs/html/guide/topics/search/search-dialog.jd @@ -1,38 +1,61 @@ -page.title=Using the Android Search Dialog +page.title=Creating a Search Interface parent.title=Search parent.link=index.html @jd:body <div id="qv-wrapper"> <div id="qv"> + + <h2>Quickview</h2> + <ul> + <li>The Android system sends search queries from the search dialog or widget to an activity you +specify to perform searches and present results</li> + <li>You can put the search widget in the Action Bar, as an "action view," for quick +access</li> + </ul> + + <h2>In this document</h2> <ol> <li><a href="#TheBasics">The Basics</a></li> <li><a href="#SearchableConfiguration">Creating a Searchable Configuration</a></li> <li><a href="#SearchableActivity">Creating a Searchable Activity</a> <ol> - <li><a href="#DeclaringSearchableActivity">Declaring a searchable Activity</a></li> + <li><a href="#DeclaringSearchableActivity">Declaring a searchable activity</a></li> + <li><a href="#EnableSearch">Enabling the search dialog and search widget</a></li> <li><a href="#PerformingSearch">Performing a search</a></li> </ol> </li> -<li><a href="#InvokingTheSearchDialog">Invoking the Search Dialog</a> +<li><a href="#UsingTheSearchDialog">Using the Search Dialog</a> + <ol> + <li><a href="#LifeCycle">The impact of the search dialog on your activity lifecycle</a></li> + <li><a href="#SearchContextData">Passing search context data</a></li> + </ol> +</li> +<li><a href="#UsingSearchWidget">Using the Search Widget</a> <ol> - <li><a href="#LifeCycle">The impact of the search dialog on your Activity life-cycle</a></li> + <li><a href="#ConfiguringWidget">Configuring the search widget</a></li> + <li><a href="#WidgetFeatures">Other search widget features</a></li> </ol> </li> -<li><a href="#SearchContextData">Passing Search Context Data</a></li> <li><a href="#VoiceSearch">Adding Voice Search</a></li> +<li><a href="#SearchSuggestions">Adding Search Suggestions</a></li> </ol> <h2>Key classes</h2> <ol> <li>{@link android.app.SearchManager}</li> +<li>{@link android.widget.SearchView}</li> </ol> <h2>Related samples</h2> <ol> <li><a href="{@docRoot}resources/samples/SearchableDictionary/index.html">Searchable Dictionary</a></li> +<li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/view/SearchViewActionBar.html">SearchView + in the Action Bar</a></li> +<li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/view/SearchViewFilterMode.html">SearchView + filter mode</a></li> </ol> <h2>Downloads</h2> @@ -50,16 +73,24 @@ Dictionary</a></li> </div> </div> -<p>When you want to implement search in your application, the last thing you should have to worry -about is where to put the search box. When you implement search with the Android search framework, -you don't have to. When the user invokes search, a search dialog appears at the top of the screen -with your application icon to the left of the search box. When the user executes the search, your -application receives the query so it can search your application's data. An example of the search -dialog is shown in figure 1.</p> +<p>When you're ready to add search functionality to your application, Android helps you implement +the user interface with either a search dialog that appears at the top of the activity window or a +search widget that you can insert in your layout. Both the search dialog and the widget can deliver +the user's search query to a specific activity in your application. This way, the user can initiate +a search from any activity where the search dialog or widget is available, and the system starts the +appropriate activity to perform the search and present results.</p> + +<p>Other features available for the search dialog and widget include:</p> -<p>This guide shows you how to set up your application to provide search in the search -dialog. When you use the search dialog, you provide a standardized search -experience and can add features such as voice search and search suggestions.</p> +<ul> + <li>Voice search</li> + <li>Search suggestions based on recent queries</li> + <li>Search suggestions that match actual results in your application data</li> +</ul> + +<p>This guide shows you how to set up your application to provide a search interface +that's assisted by the Android system to deliver search queries, using either the +search dialog or the search widget.</p> <h2 id="TheBasics">The Basics</h2> @@ -69,40 +100,78 @@ experience and can add features such as voice search and search suggestions.</p> <p class="img-caption"><strong>Figure 1.</strong> Screenshot of an application's search dialog.</p> </div> -<p>The Android search framework manages the search dialog for your application. You never need -to draw it or worry about where it is, and your Activity is not interrupted when the search dialog -appears. The Search Manager ({@link android.app.SearchManager}) is the component that does this work -for you. It manages the life of the search dialog and sends your application the user's search -query.</p> - -<p>When the user executes a search, the Search Manager creates an {@link android.content.Intent} to -pass the search query to the Activity that you've declared to handle searches. Basically, all you -need is an Activity that receives the search Intent, performs the search, and presents the results. -Specifically, you need the following:</p> - -<dl> - <dt>A searchable configuration</dt> - <dd>An XML file that configures the search dialog and includes settings for features such as voice -search, search suggestion, and the hint text.</dd> - <dt>A searchable Activity</dt> - <dd>The {@link android.app.Activity} that receives the search query, then searches your data and -displays the search results.</dd> - <dt>A mechanism by which the user can invoke search</dt> - <dd>The device search key invokes the search dialog, by default. However, a dedicated search key -is not guaranteed on all devices, so provide another means by which the user can invoke a search, -such as a search button in the Options Menu or elsewhere in the Activity UI.</dd> -</dl> - +<p>Before you begin, you should decide whether you'll implement your search interface using the +search dialog or the search widget. Both provide the same search features, but in slightly different +ways:</p> + +<ul> + <li>The <strong>search dialog</strong> is a UI component that's controlled by the Android system. +When activated by the user, the search dialog appears at the top of the activity, as shown in figure +1. + <p>The Android system controls all events in the search dialog. When the user +submits a query, the system delivers the query to the activity that you specify to +handle searches. The dialog can also provide search suggestions while the user types.</p></li> + + <li>The <strong>search widget</strong> is an instance of {@link android.widget.SearchView} that +you can place anywhere in your layout. By default, the search widget behaves like a standard {@link +android.widget.EditText} widget and doesn't do anything, but you can configure it so that the +Android system handles all input events, delivers queries to the appropriate activity, and provides +search suggestions (just like the search dialog). However, the search widget is available only in +Android 3.0 (API Level 11) and higher. + +<p class="note"><strong>Note:</strong> If you want, you can handle all user input into the +search widget yourself, using various callback methods and listeners. This document, however, +focuses on how to integrate the search widget with the system for an assisted search +implementation. If you want to handle all user input yourself, read the reference documentation for +{@link android.widget.SearchView} and its nested interfaces. </p></li> +</ul> + +<p>When the user executes a search from the search dialog or a search widget, the system creates an +{@link android.content.Intent} and stores the user query in it. The system then starts the activity +that you've declared to handle searches (the "searchable activity") and delivers it the intent. To +set up your application for this kind of assisted search, you need the following:</p> + +<ul> + <li>A searchable configuration + <p>An XML file that configures some settings for the search dialog or widget. It includes settings +for features such as voice search, search suggestion, and hint text for the search box.</p></li> + <li>A searchable activity + <p>The {@link android.app.Activity} that receives the search query, searches your +data, and displays the search results.</p></li> + <li>A search interface, provided by either: + <ul> + <li>The search dialog + <p>By default, the search dialog is hidden, but appears at the top of the screen when the +user presses the device SEARCH button (when available) or another button in your user interface.</p> + </li> + <li>Or, a {@link android.widget.SearchView} widget + <p>Using the search widget allows you to put the search box anywhere in your activity. +Instead of putting it in your activity layout, however, it's usually more convenient for users as an +<a href="{@docRoot}guide/topics/ui/actionbar.html#ActionView">action view in the Action Bar</a>.</p> + </li> + </ul> + </li> +</ul> + +<p>The rest of this document shows you how to create the searchable configuration, searchable +activity, and implement a search interface with either the search dialog or search widget.</p> <h2 id="SearchableConfiguration">Creating a Searchable Configuration</h2> -<p>The searchable configuration is an XML file that defines several settings for the search -dialog in your application. This file is traditionally named {@code searchable.xml} and must be -saved in the {@code res/xml/} project directory.</p> +<p>The first thing you need is an XML file called the searchable configuration. It configures +certain UI aspects of the search dialog or widget and defines how features such as suggestions and +voice search behave. This file is traditionally named {@code searchable.xml} and must be saved in +the {@code res/xml/} project directory.</p> + +<p class="note"><strong>Note:</strong> The system uses this file to instantiate a {@link +android.app.SearchableInfo} object, but you cannot create this object yourself at +runtime—you must declare the searchable configuration in XML.</p> -<p>The file must consist of the {@code <searchable>} element as the root node and specify one -or more attributes that configure your search dialog. For example:</p> +<p>The searchable configuration file must include the <a +href="{@docRoot}guide/topics/search/searchable-config.html#searchable-element">{@code +<searchable>}</a> element as the root node and specify one +or more attributes. For example:</p> <pre> <?xml version="1.0" encoding="utf-8"?> @@ -112,51 +181,61 @@ or more attributes that configure your search dialog. For example:</p> </searchable> </pre> -<p>The {@code android:label} attribute is the only required attribute and points to a string -resource, which should be the same as the application name. This label isn't actually visible to the -user until you enable suggestions for Quick Search Box, at which point, this label is visible in the -list of Searchable items in the system Settings.</p> +<p>The {@code android:label} attribute is the only required attribute. It points to a string +resource, which should be the application name. This label isn't actually visible to the +user until you enable search suggestions for Quick Search Box. At that point, this label is visible +in the list of Searchable items in the system Settings.</p> <p>Though it's not required, we recommend that you always include the {@code android:hint} -attribute, which provides a hint string in the search dialog's text box before the user -enters their query. The hint is important because it provides important clues to users about what +attribute, which provides a hint string in the search box before users +enters a query. The hint is important because it provides important clues to users about what they can search.</p> <p class="note"><strong>Tip:</strong> For consistency among other Android applications, you should format the string for {@code android:hint} as "Search -<em><content-or-product></em>". For example, "Search songs and artists" or "Search +<content-or-product>". For example, "Search songs and artists" or "Search YouTube".</p> -<p>The {@code <searchable>} element accepts several other attributes. Most attributes apply -only when configuring features such as search suggestions and voice search.</p> - -<p>For more details about the searchable configuration file, see the <a -href="{@docRoot}guide/topics/search/searchable-config.html">Searchable Configuration</a> -reference.</p> +<p>The <a +href="{@docRoot}guide/topics/search/searchable-config.html#searchable-element">{@code +<searchable>}</a> element accepts several other attributes. However, you don't need +most attributes until you add features such as <a href="#SearchSuggestions">search suggestions</a> +and <a href="#VoiceSearch">voice search</a>. For detailed information about the searchable +configuration file, see the <a +href="{@docRoot}guide/topics/search/searchable-config.html">Searchable Configuration</a> reference +document.</p> <h2 id="SearchableActivity">Creating a Searchable Activity</h2> -<p>When the user executes a search from the search dialog, the Search Manager takes the query -and sends it to your searchable {@link android.app.Activity} in the {@link -android.content.Intent#ACTION_SEARCH} {@link android.content.Intent}. Your searchable Activity -then searches your data using the query and presents the results to the user.</p> +<p>A searchable activity is the {@link android.app.Activity} in your application that performs +searches based on a query string and presents the search results.</p> + +<p>When the user executes a search in the search dialog or widget, the system starts your +searchable activity and delivers it the search query in an {@link +android.content.Intent} with the {@link android.content.Intent#ACTION_SEARCH} action. Your +searchable activity retrieves the query from the intent's {@link android.app.SearchManager#QUERY +QUERY} extra, then searches your data and presents the results.</p> -<p>In order for the Search Manager to know where to deliver the search query, you must declare your -searchable Activity in the Android manifest file.</p> +<p>Because you may include the search dialog or widget in any other activity in your application, +the system must know which activity is your searchable activity, so it can properly deliver the +search query. So, you must first declare your searchable activity in the Android manifest file.</p> -<h3 id="DeclaringSearchableActivity">Declaring a searchable Activity</h3> +<h3 id="DeclaringSearchableActivity">Declaring a searchable activity</h3> -<p>If you don't have one already, create an {@link android.app.Activity} that performs -searches and present search results. To set up this Activity as your searchable Activity:</p> +<p>If you don't have one already, create an {@link android.app.Activity} that will perform +searches and present results. You don't need to implement the search functionality yet—just +create an activity that you can declare in the manifest. Inside the manifest's <a +href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a> +element:</p> <ol> - <li>Declare the Activity to accept the {@link android.content.Intent#ACTION_SEARCH} {@link -android.content.Intent}, in an <a -href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code <intent-filter>}</a> + <li>Declare the activity to accept the {@link android.content.Intent#ACTION_SEARCH} intent, in an +<a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code +<intent-filter>}</a> element.</li> - <li>Apply the searchable configuration, in a <a + <li>Specify the searchable configuration to use, in a <a href="{@docRoot}guide/topics/manifest/meta-data-element.html">{@code <meta-data>}</a> element.</li> </ol> @@ -165,7 +244,7 @@ element.</li> <pre> <application ... > - <activity android:name=".MySearchableActivity" > + <activity android:name=".SearchableActivity" > <intent-filter> <action android:name="android.intent.action.SEARCH" /> </intent-filter> @@ -181,71 +260,22 @@ value of {@code "android.app.searchable"} and the {@code android:resource} attri reference to the searchable configuration file (in this example, it refers to the {@code res/xml/searchable.xml} file).</p> -<p class="note"><strong>Note:</strong> The {@code <intent-filter>} does not need a <a +<p class="note"><strong>Note:</strong> The <a +href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code +<intent-filter>}</a> does not need a <a href="{@docRoot}guide/topics/manifest/category-element.html">{@code <category>}</a> with the -{@code DEFAULT} value, because the Search Manager delivers the {@link -android.content.Intent#ACTION_SEARCH} Intent explicitly to your searchable Activity by name.</p> - -<p>The search dialog is not, by default, available from every Activity of your -application. Rather, the search dialog is presented to users only when they -invoke search from a searchable context of your application. A searchable context is any Activity -for which you have -declared searchable meta-data in the manifest file. For example, the searchable Activity itself -(declared in the manifest snippet above) is -a searchable context because it includes meta-data that defines the -searchable configuration. Any other Activity in your application is not a searchable context, by -default, and thus, does not reveal the search dialog. However, you probably do want the search -dialog available from your other activities (and to launch the searchable Activity when the user -executes a search). You can do exactly that.</p> - -<p>If you want all of your activities to provide the search dialog, add another {@code -<meta-data>} element inside the {@code -<application>} element. Use this element to declare the existing searchable Activity as the -default searchable Activity. For example:</p> - -<pre> -<application ... > - <activity android:name=".MySearchableActivity" > - <intent-filter> - <action android:name="android.intent.action.SEARCH" /> - </intent-filter> - <meta-data android:name="android.app.searchable" - android:resource="@xml/searchable"/> - </activity> - <activity android:name=".AnotherActivity" ... > - </activity> - <!-- declare the default searchable Activity for the whole app --> - <b><meta-data android:name="android.app.default_searchable" - android:value=".MySearchableActivity" /></b> - ... -</application> -</pre> +{@code DEFAULT} value (which you usually see in <a +href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a> elements), +because the system delivers the {@link android.content.Intent#ACTION_SEARCH} intent explicitly to +your searchable activity, using its component name.</p> -<p>The {@code <meta-data>} element with the {@code android:name} attribute value of -{@code "android.app.default_searchable"} specifies a default searchable Activity for the context in -which it is placed (which, in this case, is the entire application). The searchable Activity to -use is specified with the {@code android:value} attribute. All other activities in the -application, such as {@code AnotherActivity}, are now considered a searchable context and can invoke -the search dialog. When a search is executed, {@code MySearchableActivity} is launched to handle -the search query.</p> - -<p>You can also control which activities provide search at a more granular level. -To specify only an individual Activity as a searchable context, place the {@code -<meta-data>} with the {@code -"android.app.default_searchable"} name inside the respective {@code <activity>} -element (rather than inside the {@code <application>} element). While uncommon, you -can also create more than one searchable Activity and provide each one in different contexts of your -application, either by declaring a different searchable Activity in each {@code <activity>} -element, or by declaring a default searchable Activity for the entire application and then -overriding it with a {@code <meta-data>} element inside certain activities. (You might do -this if you want to search different sets of data that cannot be handled by the same -searchable Activity, depending on the currently open Activity.)</p> <h3 id="PerformingSearch">Performing a search</h3> -<p>Once you have declared your searchable Activity, performing a search for the user involves -three steps:</p> +<p>Once you have declared your searchable activity in the manifest, performing a search in your +searchable activity involves three steps:</p> + <ol> <li><a href="#ReceivingTheQuery">Receiving the query</a></li> <li><a href="#SearchingYourData">Searching your data</a></li> @@ -253,20 +283,19 @@ three steps:</p> </ol> <p>Traditionally, your search results should be presented in a {@link android.widget.ListView}, so -you might want your searchable Activity to extend {@link android.app.ListActivity}, which -provides easy access to {@link android.widget.ListView} APIs. (See the <a -href="{@docRoot}resources/tutorials/views/hello-listview.html">List View Tutorial</a> for a simple -{@link android.app.ListActivity} sample.)</p> +you might want your searchable activity to extend {@link android.app.ListActivity}. It includes +a default layout with a single {@link android.widget.ListView} and provides several +convenience methods for working with the {@link android.widget.ListView}.</p> <h4 id="ReceivingTheQuery">Receiving the query</h4> -<p>When a user executes a search from the search dialog, the Search Manager sends the {@link -android.content.Intent#ACTION_SEARCH} {@link android.content.Intent} to your searchable Activity. -This Intent carries the search query in the +<p>When a user executes a search from the search dialog or widget, the system starts your +searchable activity and sends it a {@link android.content.Intent#ACTION_SEARCH} intent. This intent +carries the search query in the {@link android.app.SearchManager#QUERY QUERY} string extra. You must check for -this Intent when the Activity starts and extract the string. For example, here's how you can get the -query when your Activity starts:</p> +this intent when the activity starts and extract the string. For example, here's how you can get the +search query when your searchable activity starts:</p> <pre> @Override @@ -274,8 +303,8 @@ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.search); + // Get the intent, verify the action and get the query Intent intent = getIntent(); - if (Intent.ACTION_SEARCH.equals(intent.getAction())) { String query = intent.getStringExtra(SearchManager.QUERY); doMySearch(query); @@ -284,7 +313,7 @@ public void onCreate(Bundle savedInstanceState) { </pre> <p>The {@link android.app.SearchManager#QUERY QUERY} string is always included with -the {@link android.content.Intent#ACTION_SEARCH} Intent. In this example, the query is +the {@link android.content.Intent#ACTION_SEARCH} intent. In this example, the query is retrieved and passed to a local {@code doMySearch()} method where the actual search operation is done.</p> @@ -294,12 +323,13 @@ is done.</p> <p>The process of storing and searching your data is unique to your application. You can store and search your data in many ways, but this guide does not show you how to store your data and search it. Storing and searching your data is something you should carefully consider in -terms of your needs and your data. However, here are some tips you might be able to apply:</p> +terms of your needs and your data format. However, here are some tips you might be able to +apply:</p> <ul> <li>If your data is stored in a SQLite database on the device, performing a full-text search -(using FTS3, rather than a LIKE query) can provide a more robust search across text data and can -produce results significantly faster. See <a href="http://sqlite.org/fts3.html">sqlite.org</a> +(using FTS3, rather than a {@code LIKE} query) can provide a more robust search across text data and +can produce results significantly faster. See <a href="http://sqlite.org/fts3.html">sqlite.org</a> for information about FTS3 and the {@link android.database.sqlite.SQLiteDatabase} class for information about SQLite on Android. Also look at the <a href="{@docRoot}resources/samples/SearchableDictionary/index.html">Searchable Dictionary</a> sample @@ -307,43 +337,45 @@ application to see a complete SQLite implementation that performs searches with <li>If your data is stored online, then the perceived search performance might be inhibited by the user's data connection. You might want to display a spinning progress wheel until your search returns. See {@link android.net} for a reference of network APIs and <a -href="{@docRoot}guide/topics/ui/dialogs.html#ProgressDialog">Creating a Progress Dialog</a> to see -how you can display a progress wheel.</li> +href="{@docRoot}guide/topics/ui/dialogs.html#ProgressDialog">Creating a Progress Dialog</a> +for information about how to display a progress wheel.</li> </ul> <div class="sidebox-wrapper"> <div class="sidebox"> <h2>About Adapters</h2> -<p>An Adapter binds individual items from a set of data into individual {@link -android.view.View} objects. When the Adapter -is applied to a {@link android.widget.ListView}, the Views are injected as individual items of the -list. {@link -android.widget.Adapter} is simply an interface, so implementations such as {@link +<p>An {@link android.widget.Adapter} binds each item from a set of data into a +{@link android.view.View} object. When the {@link android.widget.Adapter} +is applied to a {@link android.widget.ListView}, each piece of data is inserted as an individual +view into the list. {@link +android.widget.Adapter} is just an interface, so implementations such as {@link android.widget.CursorAdapter} (for binding data from a {@link android.database.Cursor}) are needed. -If none of the existing implementations work for your data, then you should implement your own from +If none of the existing implementations work for your data, then you can implement your own from {@link android.widget.BaseAdapter}. Install the SDK Samples package for API Level 4 to see the -original version of the Searchable Dictionary, which creates a custom BaseAdapter.</p> +original version of the Searchable Dictionary, which creates a custom adapter to read data from +a file.</p> </div> </div> <p>Regardless of where your data lives and how you search it, we recommend that you return search -results to your searchable Activity with an {@link android.widget.Adapter}. This way, you can easily +results to your searchable activity with an {@link android.widget.Adapter}. This way, you can easily present all the search results in a {@link android.widget.ListView}. If your data comes from a -SQLite database query, then you can apply your results to a {@link android.widget.ListView} +SQLite database query, you can apply your results to a {@link android.widget.ListView} using a {@link android.widget.CursorAdapter}. If your data comes in some other type of format, then -you can create an extension of the {@link android.widget.BaseAdapter}.</p> +you can create an extension of {@link android.widget.BaseAdapter}.</p> + <h4 id="PresentingTheResults">Presenting the results</h4> -<p>Presenting your search results is mostly a UI detail that is not handled by the search APIs. -However, one option is to create your searchable Activity to extend {@link -android.app.ListActivity} and call {@link -android.app.ListActivity#setListAdapter(ListAdapter)}, passing it an {@link +<p>As discussed above, the recommended UI for your search results is a {@link +android.widget.ListView}, so you might want your searchable activity to extend {@link +android.app.ListActivity}. You can then call {@link +android.app.ListActivity#setListAdapter(ListAdapter) setListAdapter()}, passing it an {@link android.widget.Adapter} that is bound to your data. This injects all the -results into the Activity {@link android.widget.ListView}.</p> +search results into the activity {@link android.widget.ListView}.</p> -<p>For more help presenting your results, see the {@link android.app.ListActivity} +<p>For more help presenting your results in a list, see the {@link android.app.ListActivity} documentation.</p> <p>Also see the <a @@ -353,22 +385,130 @@ for an a complete demonstration of how to search an SQLite database and use an -<h2 id="InvokingTheSearchDialog">Invoking the Search Dialog</h2> -<p>Once you have a searchable Activity, invoking the search dialog is easy. Many Android -devices provide a dedicated SEARCH key, which reveals the search dialog when the user presses it -from a searchable context of your application. However, you should not assume that a SEARCH -key is available on the user's device and should always provide a search button in your UI that -invokes search.</p> -<p>To invoke search from your Activity, call {@link android.app.Activity#onSearchRequested()}.</p> +<h2 id="SearchDialog">Using the Search Dialog</h2> + +<div class="sidebox-wrapper"> +<div class="sidebox"> + <h2>Should I use the search dialog or the widget?</h2> + <p>The answer depends mostly on whether you are developing for Android 3.0 (API Level 11 or +higher), because the {@link android.widget.SearchView} widget was introduced in Android 3.0. So, +if you are developing your application for a version of Android lower than 3.0, the search widget is +not an option and you should use the search dialog to implement your search interface.</p> + <p>If you <em>are</em> developing for Android 3.0 or higher, then the decision depends more on +your needs. In most cases, we recommend that you use the search widget as an "action view" in the +Action Bar. However, it might not be an option for you to put the search +widget in the Action Bar for some reason (perhaps there's not enough space or you don't use the +Action Bar). So, you might instead want to put the search widget somewhere in your activity layout. +And if all else fails, you can still use the search dialog if you prefer to keep the search box +hidden. In fact, you might want to offer both the dialog and the widget in some cases. For more +information about the widget, skip to <a href="#UsingSearchWidget">Using the Search Widget</a>.</p> +</div> +</div> + +<p>The search dialog provides a floating search box at the top of the screen, with the application +icon on the left. The search dialog can provide search suggestions as the user types and, when +the user executes a search, the system sends the search query to a +searchable activity that performs the search. However, if you are developing +your application for devices running Android 3.0, you should consider using the search widget +instead (see the side box).</p> + +<p>The search dialog is always hidden by default, until the user activates it. If the user's device +includes a SEARCH button, pressing it will activate the search dialog by default. Your application +can also activate the search dialog on demand by calling {@link +android.app.Activity#onSearchRequested onSearchRequested()}. However, neither of these work +until you enable the search dialog for the activity.</p> + +<p>To enable the search dialog, you must indicate to the system which searchable activity should +receive search queries from the search dialog, in order to perform searches. For example, in the +previous section about <a href="#SearchableActivity">Creating a Searchable Activity</a>, a +searchable activity named {@code SearchableActivity} was created. If you want a separate activity, +named {@code OtherActivity}, to show the search dialog and deliver searches to {@code +SearchableActivity}, you must declare in the manifest that {@code SearchableActivity} is the +searchable activity to use for the search dialog in {@code OtherActivity}.</p> + +<p>To declare the searchable activity for an activity's search dialog, +add a <a href="{@docRoot}guide/topics/manifest/meta-data-element.html">{@code <meta-data>}</a> +element inside the respective activity's <a +href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a> element. +The <a href="{@docRoot}guide/topics/manifest/meta-data-element.html">{@code <meta-data>}</a> +element must include the {@code android:value} attribute that specifies the searchable activity's +class name and the {@code android:name} attribute with a value of {@code +"android.app.default_searchable"}.</p> + +<p>For example, here is the declaration for +both a searchable activity, {@code SearchableActivity}, and another activity, {@code +OtherActivity}, which uses {@code SearchableActivity} to perform searches executed from its +search dialog:</p> + +<pre> +<application ... > + <!-- this is the searchable activity; it performs searches --> + <activity android:name=".SearchableActivity" > + <intent-filter> + <action android:name="android.intent.action.SEARCH" /> + </intent-filter> + <meta-data android:name="android.app.searchable" + android:resource="@xml/searchable"/> + </activity> + + <!-- this activity enables the search dialog to initiate searches + in the SearchableActivity --> + <activity android:name=".OtherActivity" ... > + <!-- enable the search dialog to send searches to SearchableActivity --> + <b><meta-data android:name="android.app.default_searchable" + android:value=".SearchableActivity" /></b> + </activity> + ... +</application> +</pre> + +<p>Because the {@code OtherActivity} now includes a <a +href="{@docRoot}guide/topics/manifest/meta-data-element.html">{@code <meta-data>}</a> +element to declare which searchable activity to use for searches, the activity has enabled the +search dialog. +While the user is in this activity, the device SEARCH button (if available) and the {@link +android.app.Activity#onSearchRequested onSearchRequested()} method will activate the search dialog. +When the user executes the search, the system starts {@code SearchableActivity} and delivers it +the {@link android.content.Intent#ACTION_SEARCH} intent.</p> + +<p class="note"><strong>Note:</strong> The searchable activity itself provides the search dialog +by default, so you don't need to add this declaration to {@code SearchableActivity}.</p> + +<p>If you want every activity in your application to provide the search dialog, insert the above <a +href="{@docRoot}guide/topics/manifest/meta-data-element.html">{@code <meta-data>}</a> +element as a child of the <a +href="{@docRoot}guide/topics/manifest/application-element.html">{@code <application>}</a> +element, instead of each <a +href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a>. This +way, every activity inherits the value, provides the search dialog, and delivers searches to +the same searchable activity. (If you have multiple searchable activities, you can override the +default searchable activity by placing a different <a +href="{@docRoot}guide/topics/manifest/meta-data-element.html">{@code <meta-data>}</a> +declaration inside individual activities.)</p> + +<p>With the search dialog now enabled for your activities, your application is ready to perform +searches.</p> + + +<h3 id="InvokingTheSearchDialog">Invoking the search dialog</h3> + +<p>As mentioned above, the device SEARCH button and {@link android.app.Activity#onSearchRequested +onSearchRequested()} method will open the search dialog, as long as the current activity +has declared the searchable activity to use, as shown in the previous section.</p> + +<p>However, you should not assume that a SEARCH button is available on the user's device. You +should always provide another search button in your UI that activates the search dialog by calling +{@link android.app.Activity#onSearchRequested()}.</p> -<p>For instance, you should provide a menu item in your <a -href="{@docRoot}guide/topics/ui/menus.html#options-menu">Options Menu</a> or a button in your UI to -invoke search with this method. The <a +<p>For instance, you should either provide a menu item in your <a +href="{@docRoot}guide/topics/ui/menus.html#options-menu">Options Menu</a> or a button in your +activity layout that +activates search by calling {@link android.app.Activity#onSearchRequested()}. The <a href="{@docRoot}shareables/search_icons.zip">search_icons.zip</a> file includes icons for -medium and high density screens, which you can use for your search menu item or button (low density -screens automatically scale-down the hdpi image by one half). </p> +medium and high density screens, which you can use for your search menu item or button (low-density +screens scale-down the hdpi image by one half). </p> <!-- ... maybe this should go into the Creating Menus document .... <p>If you chose to provide a shortcut key for the menu item, using {@link @@ -376,27 +516,28 @@ android.view.MenuItem#setAlphabeticShortcut(char)}, then SearchManager.MENU_KEY key character, representing the default search key.</p> --> -<p>You can also enable "type-to-search" functionality, which reveals the search dialog when the -user starts typing on the keyboard and the keystrokes are inserted into the search dialog. You can -enable type-to-search in your Activity by calling +<p>You can also enable "type-to-search" functionality, which activates the search dialog when the +user starts typing on the keyboard—the keystrokes are inserted into the search dialog. You can +enable type-to-search in your activity by calling {@link android.app.Activity#setDefaultKeyMode(int) setDefaultKeyMode}({@link -android.app.Activity#DEFAULT_KEYS_SEARCH_LOCAL}) during your Activity's +android.app.Activity#DEFAULT_KEYS_SEARCH_LOCAL}) during your activity's {@link android.app.Activity#onCreate(Bundle) onCreate()} method.</p> -<h3 id="LifeCycle">The impact of the search dialog on your Activity lifecycle</h3> +<h3 id="LifeCycle">The impact of the search dialog on your activity lifecycle</h3> <p>The search dialog is a {@link android.app.Dialog} that floats at the top of the -screen. It does not cause any change in the Activity stack, so when the search dialog appears, no -lifecycle methods for the currently open Activity (such as {@link -android.app.Activity#onPause()}) are called. Your Activity just loses input focus as it is given to -the search dialog. +screen. It does not cause any change in the activity stack, so when the search dialog appears, no +lifecycle methods (such as {@link android.app.Activity#onPause()}) are called. Your activity just +loses input focus, as input focus is given to the search dialog. </p> -<p>If you want to be notified when search is invoked, override the {@link -android.app.Activity#onSearchRequested()} method. When the system calls this method, you can do any -work you want to when your Activity looses input focus to the search dialog (such as pause -animations). Unless you are <a href="#SearchContextData">passing search context data</a> +<p>If you want to be notified when the search dialog is activated, override the {@link +android.app.Activity#onSearchRequested()} method. When the system calls this method, it is an +indication that your activity has lost input focus to the search dialog, so you can do any +work appropriate for the event (such as pause +a game). Unless you are <a +href="#SearchContextData">passing search context data</a> (discussed below), you should end the method by calling the super class implementation. For example:</p> @@ -408,8 +549,8 @@ public boolean onSearchRequested() { } </pre> -<p>If the user cancels search by pressing the BACK key, the Activity in which search was -invoked re-gains input focus. You can register to be notified when the search dialog is +<p>If the user cancels search by pressing the BACK button, the search dialog closes and the activity +regains input focus. You can register to be notified when the search dialog is closed with {@link android.app.SearchManager#setOnDismissListener(SearchManager.OnDismissListener) setOnDismissListener()} and/or {@link android.app.SearchManager#setOnCancelListener(SearchManager.OnCancelListener) @@ -420,25 +561,26 @@ android.app.SearchManager.OnCancelListener OnCancelListener} only pertains to ev user explicitly exited the search dialog, so it is not called when a search is executed (in which case, the search dialog naturally disappears).</p> -<p>If the current Activity is not the searchable Activity, then the normal Activity lifecycle -events are triggered once the user executes a search (the current Activity receives {@link +<p>If the current activity is not the searchable activity, then the normal activity lifecycle +events are triggered once the user executes a search (the current activity receives {@link android.app.Activity#onPause()} and so forth, as -described in <a href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">Activities</a> -document). If, however, the current Activity is the searchable Activity, then one of two +described in the <a +href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">Activities</a> +document). If, however, the current activity is the searchable activity, then one of two things happens:</p> <ol type="a"> - <li>By default, the searchable Activity receives the {@link -android.content.Intent#ACTION_SEARCH} Intent with a call to {@link + <li>By default, the searchable activity receives the {@link +android.content.Intent#ACTION_SEARCH} intent with a call to {@link android.app.Activity#onCreate(Bundle) onCreate()} and a new instance of the -Activity is brought to the top of the Activity stack. There are now two instances of your -searchable Activity in the Activity stack (so pressing the BACK key goes back to the previous -instance of the searchable Activity, rather than exiting the searchable Activity).</li> - <li>If you set {@code android:launchMode} to "singleTop", then the -searchable Activity receives the {@link android.content.Intent#ACTION_SEARCH} Intent with a call +activity is brought to the top of the activity stack. There are now two instances of your +searchable activity in the activity stack (so pressing the BACK button goes back to the previous +instance of the searchable activity, rather than exiting the searchable activity).</li> + <li>If you set {@code android:launchMode} to <code>"singleTop"</code>, then the +searchable activity receives the {@link android.content.Intent#ACTION_SEARCH} intent with a call to {@link android.app.Activity#onNewIntent(Intent)}, passing the new {@link -android.content.Intent#ACTION_SEARCH} Intent here. For example, here's how you might handle -this case, in which the searchable Activity's launch mode is "singleTop": +android.content.Intent#ACTION_SEARCH} intent here. For example, here's how you might handle +this case, in which the searchable activity's launch mode is <code>"singleTop"</code>: <pre> @Override public void onCreate(Bundle savedInstanceState) { @@ -463,29 +605,29 @@ private void handleIntent(Intent intent) { <p>Compared to the example code in the section about <a href="#PerformingSearch">Performing a Search</a>, all the code to handle the -search Intent is now in the {@code handleIntent()} method, so that both {@link +search intent is now in the {@code handleIntent()} method, so that both {@link android.app.Activity#onCreate(Bundle) onCreate()} and {@link android.app.Activity#onNewIntent(Intent) onNewIntent()} can execute it.</p> -<p>When the system calls {@link android.app.Activity#onNewIntent(Intent)}, the Activity has +<p>When the system calls {@link android.app.Activity#onNewIntent(Intent)}, the activity has not been restarted, so the {@link android.app.Activity#getIntent()} method -returns the same Intent that was received with {@link +returns the same intent that was received with {@link android.app.Activity#onCreate(Bundle) onCreate()}. This is why you should call {@link android.app.Activity#setIntent(Intent)} inside {@link -android.app.Activity#onNewIntent(Intent)} (so that the Intent saved by the Activity is updated in +android.app.Activity#onNewIntent(Intent)} (so that the intent saved by the activity is updated in case you call {@link android.app.Activity#getIntent()} in the future).</p> </li> </ol> -<p>The second scenario using "singleTop" launch mode is usually ideal, because chances are good that -once a search is done, the user will perform additional searches and it's a bad experience if your -application creates multiple instances of the searchable Activity. So, we recommend that you set -your searchable Activity to "singleTop" launch mode in the application -manifest. For example:</p> +<p>The second scenario using <code>"singleTop"</code> launch mode is usually ideal, because chances +are good that once a search is done, the user will perform additional searches and it's a bad +experience if your application creates multiple instances of the searchable activity. So, we +recommend that you set your searchable activity to <code>"singleTop"</code> launch mode in the +application manifest. For example:</p> <pre> -<activity android:name=".MySearchableActivity" +<activity android:name=".SearchableActivity" <b>android:launchMode="singleTop"</b> > <intent-filter> <action android:name="android.intent.action.SEARCH" /> @@ -497,57 +639,192 @@ manifest. For example:</p> -<h2 id="SearchContextData">Passing Search Context Data</h2> +<h3 id="SearchContextData">Passing search context data</h3> -<p>To refine your search criteria from the current Activity instead of depending only on the user's -search query, you can provide additional data in the Intent that the Search Manager sends to your -searchable Activity. In a simple case, you can make your refinements inside the searchable -Activity, for every search made, but if your -search criteria varies from one searchable context to another, then you can pass whatever data -is necessary to refine your search in the {@link android.app.SearchManager#APP_DATA} {@link -android.os.Bundle}, which is included in the {@link android.content.Intent#ACTION_SEARCH} -Intent.</p> +<p>In some cases, you can make necessary refinements to the search query inside the searchable +activity, for every search made. However, if you want to refine your search criteria based on the +activity from which the user is performing a search, you can provide additional data in the intent +that the system sends to your searchable activity. You can pass the additional data in the {@link +android.app.SearchManager#APP_DATA} {@link android.os.Bundle}, which is included in the {@link +android.content.Intent#ACTION_SEARCH} intent.</p> -<p>To pass this kind of data to your searchable Activity, override {@link -android.app.Activity#onSearchRequested()} method for the Activity in which search can be invoked. +<p>To pass this kind of data to your searchable activity, override the {@link +android.app.Activity#onSearchRequested()} method for the activity from which the user can perform a +search, create a {@link android.os.Bundle} with the additional data, and call {@link +android.app.Activity#startSearch startSearch()} to activate the search dialog. For example:</p> <pre> @Override public boolean onSearchRequested() { Bundle appData = new Bundle(); - appData.putBoolean(MySearchableActivity.JARGON, true); + appData.putBoolean(SearchableActivity.JARGON, true); startSearch(null, false, appData, false); return true; } </pre> -<p>Returning "true" indicates that you have successfully handled this callback event. Then in your -searchable Activity, you can extract the data placed inside {@code appdata} from the {@link +<p>Returning "true" indicates that you have successfully handled this callback event and +called {@link android.app.Activity#startSearch startSearch()} to activate +the search dialog. Once the user submits a query, it's delivered to your +searchable activity along with the data you've added. You can extract the extra data from the {@link android.app.SearchManager#APP_DATA} {@link android.os.Bundle} to refine the search. For example:</p> <pre> Bundle appData = getIntent().getBundleExtra(SearchManager.APP_DATA); if (appData != null) { - boolean jargon = appData.getBoolean(MySearchableActivity.JARGON); + boolean jargon = appData.getBoolean(SearchableActivity.JARGON); } </pre> <p class="caution"><strong>Caution:</strong> Never call the {@link android.app.Activity#startSearch(String,boolean,Bundle,boolean) startSearch()} method from outside -the {@link android.app.Activity#onSearchRequested()} callback method. To invoke the search dialog -in your Activity, always call {@link android.app.Activity#onSearchRequested()}. Otherwise, {@link +the {@link android.app.Activity#onSearchRequested()} callback method. To activate the search dialog +in your activity, always call {@link android.app.Activity#onSearchRequested()}. Otherwise, {@link android.app.Activity#onSearchRequested()} is not called and customizations (such as the addition of {@code appData} in the above example) are missed.</p> + +<h2 id="UsingSearchWidget">Using the Search Widget</h2> + +<div class="figure" style="width:429px;margin:0"> + <img src="{@docRoot}images/ui/actionbar-actionview.png" alt="" /> + <p class="img-caption"><strong>Figure 2.</strong> The {@link +android.widget.SearchView} widget as an "action view" in the Action Bar.</p> +</div> + +<p>The {@link android.widget.SearchView} widget is available in Android 3.0 and higher. If +you're developing your application for Android 3.0 and have decided to use the search widget, we +recommend that you insert the search widget as an <a +href="{@docRoot}guide/topics/ui/actionbar.html#ActionView">action view in the Action Bar</a>, +instead of using the search dialog (and instead of placing the search widget in your activity +layout). For example, figure 2 shows the search widget in the Action Bar.</p> + +<p>The search widget provides the same functionality as the search dialog. It starts the appropriate +activity when the user executes a search, and it can provide search suggestions and perform voice +search.</p> + +<p class="note"><strong>Note:</strong> When you use the search widget as an action view, you +still might need to support using the search dialog, for cases in which the search widget does +not fit in the Action Bar. See the following section about <a href="#UsingBoth">Using both +the widget and the dialog</a>.</p> + + +<h3 id="ConfiguringWidget">Configuring the search widget</h3> + +<p>After you've created a <a href="#SearchableConfiguration">searchable configuration</a> and a <a +href="#SearchableActivity">searchable activity</a>, as discussed above, you need to enable assisted +search for each {@link android.widget.SearchView}. You can do so by calling {@link +android.widget.SearchView#setSearchableInfo setSearchableInfo()} and passing it the {@link +android.app.SearchableInfo} object that represents your searchable configuration.</p> + +<p>You can get a reference to the {@link android.app.SearchableInfo} by calling {@link +android.app.SearchManager#getSearchableInfo getSearchableInfo()} on {@link +android.app.SearchManager}.</p> + +<p>For example, if you're using a {@link android.widget.SearchView} as an action view in the <a +href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a>, you should enable the widget +during the {@link android.app.Activity#onCreateOptionsMenu onCreateOptionsMenu()} callback:</p> + +<pre> +@Override +public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the options menu from XML + MenuInflater inflater = getMenuInflater(); + 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); + SearchView searchView = (SearchView) menu.findItem(R.id.menu_search).getActionView(); + searchView.setSearchableInfo(searchManager.getSearchableInfo({@link android.app.Activity#getComponentName()})); + searchView.setIconifiedByDefault(false); // Do not iconify the widget; expand it by default + + return true; +} +</pre> + +<p>That's all you need. The search widget is now configured and the system will deliver search +queries to your searchable activity. You can also enable <a href="#SearchSuggestions">search +suggestions</a> for the search widget.</p> + +<p class="note"><strong>Note:</strong> If you want to handle all user input yourself, you can do so +with some callback methods and event listeners. For more information, see the reference +documentation for {@link android.widget.SearchView} and its nested interfaces for the +appropriate event listeners.</p> + +<p>For more information about action views in the Action Bar, read <a +href="{@docRoot}guide/topics/ui/actionbar.html#ActionView">Using the Action Bar</a> (which +includes sample code for adding a search widget as an action view).</p> + + +<h3 id="WidgetFeatures">Other search widget features</h3> + +<p>The {@link android.widget.SearchView} widget allows for a few additional features you might +want:</p> + +<dl> + <dt>A submit button</dt> + <dd>By default, there's no button to submit a search query, so the user must press the +"Return" key on the keyboard to initiate a search. You can add a "submit" button by calling +{@link android.widget.SearchView#setSubmitButtonEnabled setSubmitButtonEnabled(true)}.</dd> + <dt>Query refinement for search suggestions</dt> + <dd>When you've enabled search suggestions, you usually expect users to simply select a +suggestion, but they might also want to refine the suggested search query. You can add a button +alongside each suggestion that inserts the suggestion in the search box for refinement by the +user, by calling {@link android.widget.SearchView#setQueryRefinementEnabled +setQueryRefinementEnabled(true)}.</dd> + <dt>The ability to toggle the search box visibility</dt> + <dd>By default, the search widget is "iconified," meaning that it is represented only by a +search icon (a magnifying glass), and expands to show the search box when the user touches it. +As shown above, you can show the search box by default, by calling {@link +android.widget.SearchView#setIconifiedByDefault setIconifiedByDefault(false)}. You can also +toggle the search widget appearance by calling {@link android.widget.SearchView#setIconified +setIconified()}.</dd> +</dl> + +<p>There are several other APIs in the {@link android.widget.SearchView} class that allow you to +customize the search widget. However, most of them are used only when you handle all +user input yourself, instead of using the Android system to deliver search queries and display +search suggestions.</p> + + +<h3 id="UsingBoth">Using both the widget and the dialog</h3> + +<p>If you insert the search widget in the Action Bar as an <a +href="{@docRoot}guide/topics/ui/actionbar.html#ActionView">action view</a>, and you enable it to +appear in the Action Bar "if there is room" (by setting {@code +android:showAsAction="ifRoom"}), then there is a chance that the search widget will not appear +as an action view, but the menu item will appear in the overflow menu. For example, when your +application runs on a smaller screen, there might not be enough room in the Action Bar to display +the search widget along with other action items or navigation elements, so the menu item will +instead appear in the overflow menu. When placed in the overflow menu, the item works like an +ordinary menu item and does not display the action view (the search widget).</p> + +<p>To handle this situation, the menu item to which you've attached the search widget should +activate the search dialog when the user selects it from the overflow menu. In order for it to do +so, you must implement {@link android.app.Activity#onOptionsItemSelected onOptionsItemSelected()} to +handle the "Search" menu item and open the search dialog by calling {@link +android.app.Activity#onSearchRequested onSearchRequested()}.</p> + +<p>For more information about how items in the Action Bar work and how to handle this situation, see +the documentation for <a href="{@docRoot}guide/topics/ui/actionbar.html">Using the Action +Bar</a>.</p> + +<p>Also see the <a +href="{@docRoot}resources/samples/SearchableDictionary/src/com/example/android/searchabledict/ +SearchableDictionary.html">Searchable Dictionary</a> for an example implementation using +both the dialog and the widget.</p> + + + <h2 id="VoiceSearch">Adding Voice Search</h2> -<p>You can add voice search functionality to your search dialog by adding the {@code +<p>You can add voice search functionality to your search dialog or widget by adding the {@code android:voiceSearchMode} attribute to your searchable configuration. This adds a voice search -button in the search dialog that launches a voice prompt. When the user +button that launches a voice prompt. When the user has finished speaking, the transcribed search query is sent to your searchable -Activity.</p> +activity.</p> <p>For example:</p> @@ -562,7 +839,7 @@ Activity.</p> <p>The value {@code showVoiceSearchButton} is required to enable voice search, while the second value, {@code launchRecognizer}, specifies that the voice search button -should launch a recognizer that returns the transcribed text to the searchable Activity.</p> +should launch a recognizer that returns the transcribed text to the searchable activity.</p> <p>You can provide additional attributes to specify the voice search behavior, such as the language to be expected and the maximum number of results to return. See the <a @@ -571,6 +848,38 @@ available attributes.</p> <p class="note"><strong>Note:</strong> Carefully consider whether voice search is appropriate for your application. All searches performed with the voice search button are immediately sent to -your searchable Activity without a chance for the user to review the transcribed query. Sufficiently +your searchable activity without a chance for the user to review the transcribed query. Sufficiently test the voice recognition and ensure that it understands the types of queries that the user might submit inside your application.</p> + + + +<h2 id="SearchSuggestions">Adding Search Suggestions</h2> + +<div class="figure" style="width:250px;margin:0"> +<img src="{@docRoot}images/search/search-suggest-custom.png" alt="" height="417" /> +<p class="img-caption"><strong>Figure 3.</strong> Screenshot of a search dialog with custom +search suggestions.</p> +</div> + +<p>Both the search dialog and the search widget can provide search suggestions as the user +types, with assistance from the Android system. The system manages the list of suggestions and +handles the event when the user selects a suggestion.</p> + +<p>You can provide two kinds of search suggestions:</p> + +<dl> + <dt>Recent query search suggestions</dt> + <dd>These suggestions are simply words that the user previously used as search queries in +your application. + <p>See <a href="adding-recent-query-suggestions.html">Adding Recent Query +Suggestions</a>.</p></dd> + <dt>Custom search suggestions</dt> + <dd>These are search suggestions that you provide from your own data source, to help users +immediately select the correct spelling or item they are searching for. Figure 3 shows an +example of custom suggestions for a dictionary application—the user can select a suggestion +to instantly go to the definition. + <p>See <a href="adding-custom-suggestions.html">Adding Custom +Suggestions</a></p></dd> +</dl> + diff --git a/docs/html/guide/topics/search/searchable-config.jd b/docs/html/guide/topics/search/searchable-config.jd index 2aa2db6..fb689f9 100644 --- a/docs/html/guide/topics/search/searchable-config.jd +++ b/docs/html/guide/topics/search/searchable-config.jd @@ -7,19 +7,20 @@ parent.link=index.html <div id="qv"> <h2>See also</h2> <ol> - <li><a href="search-dialog.html">Using the Android Search Dialog</a></li> + <li><a href="search-dialog.html">Creating a Search Interface</a></li> <li><a href="adding-recent-query-suggestions.html">Adding Recent Query Suggestions</a></li> <li><a href="adding-custom-suggestions.html">Adding Custom Suggestions</a></li> </ol> </div> </div> -<p>To utilize the Android search framework and provide a custom search dialog, your -application must provide a search -configuration in the form of an XML resource. This document describes the search configuration XML -in terms of its syntax and usage. For more information about how to implement search -features for your application, see the developer guide about <a -href="index.html">Search</a>.</p> +<p>In order to implement search with assistance from the Android system (to deliver search queries +to an activity and provide search suggestions), your application must provide a search configuration +in the form of an XML file.</p> + +<p>This page describes the search configuration file in terms of its syntax and usage. For more +information about how to implement search features for your application, begin with the developer +guide about <a href="search-dialog.html">Creating a Search Interface</a>.</p> <dl class="xml"> @@ -66,7 +67,7 @@ Android uses the filename as the resource ID.</dd> <dd> <dl class="tag-list"> <dt id="searchable-element"><code><searchable></code></dt> - <dd>Defines all search configurations used with the search dialog. + <dd>Defines all search configurations used by the Android system to provide assisted search. <p class="caps">attributes:</p> <dl class="atn-list"> <dt><code>android:label</code></dt> @@ -86,21 +87,21 @@ string for {@code android:hint} as "Search <em><content-or-product></em>". "Search songs and artists" or "Search YouTube".</dd> <dt><code>android:searchMode</code></dt> - <dd><em>Keyword</em>. Sets additional modes that control the search dialog presentation. -Currently available modes define how the query text that appears in the search dialog -should be rewritten when a custom suggestion receives focus. The following mode values are accepted: + <dd><em>Keyword</em>. Sets additional modes that control the search presentation. +Currently available modes define how the query text should be rewritten when a custom suggestion +receives focus. The following mode values are accepted: <table> <tr><th>Value</th><th>Description</th></tr> <tr> <td><code>"queryRewriteFromText"</code></td> <td>Use the value from the {@link android.app.SearchManager#SUGGEST_COLUMN_TEXT_1} -colum to rewrite the query text in the search dialog.</td> +column to rewrite the query text.</td> </tr> <tr> <td><code>"queryRewriteFromData"</code></td> <td>Use the value from the {@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_DATA} column to rewrite the -query text in the search dialog. This should only be used when the values in +query text. This should only be used when the values in {@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_DATA} are suitable for user inspection and editing, typically HTTP URI's.</td> </tr> @@ -117,7 +118,7 @@ behavior is something other than a search (such as a URL request in a web browse <dt><code>android:inputType</code></dt> <dd><em>Keyword</em>. Defines the type of input method (such as the type of soft keyboard) -to use with the search dialog. For most searches, in which free-form text is expected, you don't +to use. For most searches, in which free-form text is expected, you don't need this attribute. See {@link android.R.attr#inputType} for a list of suitable values for this attribute.</dd> @@ -161,14 +162,14 @@ can also use any non-null value to trigger the delivery of the query text via th selectionArgs} parameter (and then ignore the {@code selection} parameter).</dd> <dt><code>android:searchSuggestIntentAction</code></dt> - <dd><em>String</em>. The default Intent action to be used when a user + <dd><em>String</em>. The default intent action to be used when a user clicks on a custom search suggestion (such as {@code "android.intent.action.VIEW"}). If this is not overridden by the selected suggestion (via the {@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_ACTION} column), this value is placed in the action field of the {@link android.content.Intent} when the user clicks a suggestion.</dd> <dt><code>android:searchSuggestIntentData</code></dt> - <dd><em>String</em>. The default Intent data to be used when a user + <dd><em>String</em>. The default intent data to be used when a user clicks on a custom search suggestion. If not overridden by the selected suggestion (via the {@link android.app.SearchManager#SUGGEST_COLUMN_INTENT_DATA} column), this value is @@ -177,7 +178,7 @@ android.app.SearchManager#SUGGEST_COLUMN_INTENT_DATA} column), this value is <dt><code>android:searchSuggestThreshold</code></dt> <dd><em>Integer</em>. The minimum number of characters needed to - trigger a suggestion look-up. Only guarantees that the Search Manager will not query your + trigger a suggestion look-up. Only guarantees that the system will not query your content provider for anything shorter than the threshold. The default value is 0.</dd> </dl> @@ -210,20 +211,21 @@ albums, and tracks" for a music application, or "Saved notes" for a notepad appl supersets of queries that have returned zero results in the past. For example, if your content provider returned zero results for "bo", it should be requiried for "bob". If set to "false", supersets are ignored for a single session ("bob" does not invoke a requery). This lasts -only for the life of the search dialog (when the search dialog is reopened, "bo" queries your +only for the life of the search dialog or the life of the activity when using the search widget +(when the search dialog or activity is reopened, "bo" queries your content provider again). The default value is false.</dd> </dl> <h4>Voice search attributes</h4> - <p>To enable voice search for your search dialog, you'll need some of the + <p>To enable voice search, you'll need some of the following {@code <searchable>} attributes:</p><br/> <dl class="atn-list"> <dt><code>android:voiceSearchMode</code></dt> <dd><em>Keyword</em>. (Required to provide voice search capabilities.) - Enables voice search for the search dialog, with a specific mode for voice search. + Enables voice search, with a specific mode for voice search. (Voice search may not be provided by the device, in which case these flags have no effect.) The following mode values are accepted: <table> @@ -238,14 +240,14 @@ then either {@code "launchWebSearch"} or {@code "launchRecognizer"} must also be <td><code>"launchWebSearch"</code></td> <td>The voice search button takes the user directly to a built-in voice web search activity. Most applications don't need this flag, as - it takes the user away from the Activity in which search was invoked.</td> + it takes the user away from the activity in which search was invoked.</td> </tr> <tr> <td><code>"launchRecognizer"</code></td> <td>The voice search button takes - the user directly to a built-in voice recording activity. This Activity + the user directly to a built-in voice recording activity. This activity prompts the user to speak, transcribes the spoken text, and forwards the resulting - query text to the searchable Activity, just as if the user typed it into the + query text to the searchable activity, just as if the user typed it into the search UI and clicked the search button.</td> </tr> </table> @@ -283,9 +285,9 @@ java.util.Locale#getDefault() Locale.getDefault()}.</dd> <dt><code>android:voiceMaxResults</code></dt> <dd><em>Integer</em>. Forces the maximum number of results to return, including the "best" result which is always provided as the {@link -android.content.Intent#ACTION_SEARCH} Intent's primary +android.content.Intent#ACTION_SEARCH} intent's primary query. Must be 1 or greater. Use {@link android.speech.RecognizerIntent#EXTRA_RESULTS} to -get the results from the Intent. +get the results from the intent. If not provided, the recognizer chooses how many results to return.</dd> </dl> </dd> <!-- end searchable element --> @@ -311,8 +313,8 @@ other three attributes in order to define the search action.</p> <dd><em>String</em>. (Required.) A key code from {@link android.view.KeyEvent} that represents the action key you wish to respond to (for example {@code "KEYCODE_CALL"}). This is added to the - {@link android.content.Intent#ACTION_SEARCH ACTION_SEARCH} Intent that is passed to your - searchable Activity. To examine the key code, use + {@link android.content.Intent#ACTION_SEARCH ACTION_SEARCH} intent that is passed to your + searchable activity. To examine the key code, use {@link android.content.Intent#getIntExtra getIntExtra(SearchManager.ACTION_KEY)}. Not all keys are supported for a search action, as many of them are used for typing, navigation, or system functions.</dd> @@ -320,15 +322,15 @@ functions.</dd> <dt><code>android:queryActionMsg</code></dt> <dd><em>String</em>. An action message to be sent if the action key is pressed while the user is entering query text. This is added to the - {@link android.content.Intent#ACTION_SEARCH ACTION_SEARCH} Intent that the Search Manager - passes to your searchable Activity. To examine the string, use + {@link android.content.Intent#ACTION_SEARCH ACTION_SEARCH} intent that the system + passes to your searchable activity. To examine the string, use {@link android.content.Intent#getStringExtra getStringExtra(SearchManager.ACTION_MSG)}.</dd> <dt><code>android:suggestActionMsg</code></dt> <dd><em>String</em>. An action message to be sent if the action key is pressed while a suggestion is in focus. This is added to the - Intent that that the Search Manager passes to your searchable Activity (using the action + intent that that the system passes to your searchable activity (using the action you've defined for the suggestion). To examine the string, use {@link android.content.Intent#getStringExtra getStringExtra(SearchManager.ACTION_MSG)}. This should only be used if all your @@ -344,10 +346,10 @@ android:suggestActionMsg} attribute to define the action message for all suggest your content provider provides its own action message. <p>First, you must define a column in your content provider for each suggestion to provide an action message, then provide the name of that -column in this attribute. The Search Manager looks at your suggestion cursor, +column in this attribute. The system looks at your suggestion cursor, using the string provided here to select your action message column, and then select the action message string from the Cursor. That string is added to the - Intent that the Search Manager passes to your searchable Activity (using the action you've + intent that the system passes to your searchable activity (using the action you've defined for suggestions). To examine the string, use {@link android.content.Intent#getStringExtra getStringExtra(SearchManager.ACTION_MSG)}. If the data does not exist for the selected suggestion, the action key is ignored.</dd> diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd index 065f95a..d8898ae 100644 --- a/docs/html/guide/topics/ui/actionbar.jd +++ b/docs/html/guide/topics/ui/actionbar.jd @@ -323,8 +323,7 @@ the item is enabled as an action item.</p> <p>When adding an action view for a menu item, it's important that you still allow the item to behave as a normal menu item when it does not appear in the Action Bar. For example, a menu item to -perform a search should, by default, bring up the <a -href="{@docRoot}guide/topics/search/search-dialog.html">search dialog</a>, but if the item is +perform a search should, by default, bring up the Android search dialog, but if the item is placed in the Action Bar, the action view appears with a {@link android.widget.SearchView} widget. Figure 4 shows an example of the {@link android.widget.SearchView} widget in an action view.</p> @@ -369,9 +368,7 @@ always appear as an action view by setting {@code android:showAsAction} to {@cod <p>Now, when the menu item is displayed as an action item, it's action view appears instead of the icon and/or title text. However, if there's not enough room in the Action Bar, the item appears in the overflow menu as a normal menu item and you must respond to it from the {@link -android.app.Activity#onOptionsItemSelected onOptionsItemSelected()} callback method. (For a -guide to providing search functionality, see the <a -href="{@docRoot}guide/topics/search/index.html">Search</a> documentation.)</p> +android.app.Activity#onOptionsItemSelected onOptionsItemSelected()} callback method.</p> <p>When the activity first starts, the system populates the Action Bar and overflow menu by calling {@link android.app.Activity#onCreateOptionsMenu onCreateOptionsMenu()}. @@ -392,8 +389,8 @@ public boolean onCreateOptionsMenu(Menu menu) { } </pre> -<p>For more information about enabling search in the Action Bar, see the <a -href="{@docRoot}guide/topics/search/index.html">Search</a> developer guide.</p> +<p>For more information about using the search widget, see <a +href="{@docRoot}guide/topics/search/search-dialog.html">Creating a Search Interface</a>.</p> diff --git a/docs/html/index.jd b/docs/html/index.jd index f1bb59f..7fcd7b6 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -13,7 +13,7 @@ home=true <!-- total max width is 520px --> <img src="{@docRoot}assets/images/home/GDC2011.png" alt="Android at GDC 2011" width="203px" style="padding-left:22px;padding-bottom:28px;padding-top:22px;"/> <div id="announcement" style="width:275px"> - <p>Android will be at the <a href="http://www.gdconf.com/">2011 Game Developers Conference</a> in San Francisco, from March 1st to 4th. We're looking forward to seeing you there!</p> + <p>Thanks to everyone who visited us at the <a href="http://www.gdconf.com/">Game Developers Conference</a> in San Francisco. We're looking forward to seeing your games running on Android!</p> <p><a href="http://android-developers.blogspot.com/2011/02/heading-for-gdc.html">Learn more »</a></p> </div> <!-- end annoucement --> </div> <!-- end annoucement-block --> diff --git a/docs/html/resources/dashboard/platform-versions.jd b/docs/html/resources/dashboard/platform-versions.jd index d745cea..73d7fc1 100644 --- a/docs/html/resources/dashboard/platform-versions.jd +++ b/docs/html/resources/dashboard/platform-versions.jd @@ -52,7 +52,7 @@ Android Market within a 14-day period ending on the data collection date noted b <div class="dashboard-panel"> <img alt="" height="250" width="460" -src="http://chart.apis.google.com/chart?&cht=p&chs=460x250&chd=t:3.9,6.3,31.4,57.6,0.8&chl=Android%201.5|Android%201.6|Android%202.1|Android%202.2|Android%202.3&chco=c4df9b,6fad0c" /> +src="http://chart.apis.google.com/chart?&cht=p&chs=460x250&chd=t:3.0,4.8,29.0,61.3,0.7,1.0,0.2&chl=Android%201.5|Android%201.6|Android%202.1|Android%202.2|Android%202.3|Android%202.3.3|Android%203.0&chco=c4df9b,6fad0c" /> <table> <tr> @@ -60,14 +60,16 @@ src="http://chart.apis.google.com/chart?&cht=p&chs=460x250&chd=t:3.9,6.3,31.4,57 <th>API Level</th> <th>Distribution</th> </tr> -<tr><td>Android 1.5</td><td>3</td><td>3.9%</td></tr> -<tr><td>Android 1.6</td><td>4</td><td>6.3%</td></tr> -<tr><td>Android 2.1</td><td>7</td><td>31.4%</td></tr> -<tr><td>Android 2.2</td><td>8</td><td>57.6%</td></tr> -<tr><td>Android 2.3</td><td>9</td><td>0.8%</td></tr> +<tr><td>Android 1.5</td><td>3</td><td>3.0%</td></tr> +<tr><td>Android 1.6</td><td>4</td><td>4.8%</td></tr> +<tr><td>Android 2.1</td><td>7</td><td>29.0%</td></tr> +<tr><td>Android 2.2</td><td>8</td><td>61.3%</td></tr> +<tr><td>Android 2.3</td><td>9</td><td>0.7%</td></tr> +<tr><td>Android 2.3.3</td><td>10</td><td>1.0%</td></tr> +<tr><td>Android 3.0</td><td>11</td><td>0.2%</td></tr> </table> -<p><em>Data collected during two weeks ending on February 2, 2011</em></p> +<p><em>Data collected during two weeks ending on March 15, 2011</em></p> <!-- <p style="font-size:.9em">* <em>Other: 0.1% of devices running obsolete versions</em></p> --> @@ -96,9 +98,9 @@ Android Market within a 14-day period ending on the date indicated on the x-axis <div class="dashboard-panel"> <img alt="" height="250" width="660" style="padding:5px;background:#fff" -src="http://chart.apis.google.com/chart?&cht=lc&chs=660x250&chxt=x,x,y,r&chxr=0,0,12|1,0,12|2,0,100|3,0,100&chxl=0%3A%7C08/01%7C08/15%7C09/01%7C09/15%7C10/01%7C10/15%7C11/01%7C11/15%7C12/01%7C12/15%7C01/01%7C01/15%7C02/01%7C1%3A%7C2010%7C%7C%7C%7C%7C%7C%7C%7C%7C%7C2011%7C%7C2011%7C2%3A%7C0%25%7C25%25%7C50%25%7C75%25%7C100%25%7C3%3A%7C0%25%7C25%25%7C50%25%7C75%25%7C100%25&chxp=0,0,1,2,3,4,5,6,7,8,9,10,11,12&chxtc=0,5&chd=t:99.8,99.7,99.8,99.9,99.9,99.9,100.0,99.9,99.8,99.7,99.6,99.4,99.1|84.3,86.5,87.9,89.2,90.2,91.1,92.0,92.7,93.4,94.1,94.8,95.1,95.2|64.0,68.1,70.3,72.1,73.8,75.3,77.4,79.6,82.2,84.4,86.8,87.8,88.9|4.3,11.3,27.8,32.1,33.4,34.5,37.1,40.5,44.3,47.7,51.4,53.8,57.5&chm=tAndroid 1.5,7caa36,0,0,15,,t::-5|b,c3df9b,0,1,0|tAndroid 1.6,5b831d,1,0,15,,t::-5|b,aadb5e,1,2,0|tAndroid 2.1,38540b,2,0,15,,t::-5|b,91da1e,2,3,0|tAndroid 2.2,131d02,3,1,15,,t::-5|B,6fad0c,3,4,0&chg=7,25&chdl=Android 1.5|Android 1.6|Android 2.1|Android 2.2&chco=add274,94d134,73ad18,507d08" /> +src="http://chart.apis.google.com/chart?&cht=lc&chs=660x250&chxt=x,x,y,r&chxr=0,0,12|1,0,12|2,0,100|3,0,100&chxl=0%3A%7C09/15%7C10/01%7C10/15%7C11/01%7C11/15%7C12/01%7C12/15%7C01/01%7C01/15%7C02/01%7C02/15%7C03/01%7C03/15%7C1%3A%7C2010%7C%7C%7C%7C%7C%7C%7C2011%7C%7C%7C%7C%7C2011%7C2%3A%7C0%25%7C25%25%7C50%25%7C75%25%7C100%25%7C3%3A%7C0%25%7C25%25%7C50%25%7C75%25%7C100%25&chxp=0,0,1,2,3,4,5,6,7,8,9,10,11,12&chxtc=0,5&chd=t:99.9,99.9,99.9,100.0,99.9,99.8,99.7,100.0,99.9,99.9,99.9,100.0,99.8|89.2,90.2,91.1,92.0,92.7,93.4,94.1,95.2,95.6,96.0,96.3,96.7,96.8|72.1,73.8,75.3,77.4,79.6,82.2,84.4,87.2,88.3,89.7,90.5,91.5,92.0|32.1,33.4,34.5,37.1,40.5,44.3,47.7,51.8,54.3,58.3,59.7,61.5,63.0|0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.4,0.6,0.7,0.8,1.1,1.7|0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0&chm=tAndroid 1.5,7caa36,0,0,15,,t::-5|b,c3df9b,0,1,0|tAndroid 1.6,689326,1,0,15,,t::-5|b,b4db77,1,2,0|tAndroid 2.1,547a19,2,0,15,,t::-5|b,a5db51,2,3,0|tAndroid 2.2,3f5e0e,3,0,15,,t::-5|b,96dd28,3,4,0|b,83c916,4,5,0|B,6fad0c,5,6,0&chg=7,25&chdl=Android 1.5|Android 1.6|Android 2.1|Android 2.2|Android 2.3|Android 2.3.3&chco=add274,9dd14f,8ece2a,7ab61c,659b11,507d08" /> -<p><em>Last historical dataset collected during two weeks ending on February 2, 2011</em></p> +<p><em>Last historical dataset collected during two weeks ending on March 15, 2011</em></p> </div><!-- end dashboard-panel --> diff --git a/docs/html/sdk/android-3.0.jd b/docs/html/sdk/android-3.0.jd index 6c087bb..f88c3a6 100644 --- a/docs/html/sdk/android-3.0.jd +++ b/docs/html/sdk/android-3.0.jd @@ -556,11 +556,10 @@ keyboard) is visible, the popup does not overlap the IME it until the user touch menu.</p></li> <li>{@link android.widget.SearchView} - <p>Provides a search box that works in conjunction with the Search Manager (in the same manner -as the traditional <a href="{@docRoot}guide/topics/search/search-dialog.html">search dialog</a>). It -can also display recent query suggestions or custom suggestions as configured by the search -provider. This widget is particularly useful for offering search in the <a -href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a>.</p></li> + <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 diff --git a/docs/html/sdk/eclipse-adt.jd b/docs/html/sdk/eclipse-adt.jd index 97717fe..ece9d4a 100644 --- a/docs/html/sdk/eclipse-adt.jd +++ b/docs/html/sdk/eclipse-adt.jd @@ -1,8 +1,8 @@ page.title=ADT Plugin for Eclipse -adt.zip.version=10.0.0 -adt.zip.download=ADT-10.0.0.zip -adt.zip.bytes=4243777 -adt.zip.checksum=bf88bff62bc45c3b6d062e2beed67765 +adt.zip.version=10.0.1 +adt.zip.download=ADT-10.0.1.zip +adt.zip.bytes=5096182 +adt.zip.checksum=e26a77db08377bdd2e62edeb9a3e3701 @jd:body @@ -33,7 +33,7 @@ to build Android applications.</p> <p>ADT extends the capabilities of Eclipse to let you quickly set up new Android projects, create an application UI, add components based on the Android Framework API, debug your applications using the Android SDK tools, and even -export signed (or unsigned) APKs in order to distribute your application.</p> +export signed (or unsigned) {@code .apk} files in order to distribute your application.</p> <p>Developing in Eclipse with ADT is highly recommended and is the fastest way to get started. With the guided project setup it provides, as well as tools @@ -100,6 +100,36 @@ padding: .25em 1em; <a href="#" onclick="return toggleDiv(this)"> <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px" width="9px" /> +ADT 10.0.1</a> <em>(March 2011)</em> + <div class="toggleme"> + +<dl> + +<dt>Dependencies:</dt> + +<dd>ADT 10.0.1 is designed for use with SDK Tools r10. If you haven't +already installed SDK Tools r10 into your SDK, use the Android SDK and AVD Manager to do +so.</dd> + +<dt>General notes:</dt> +<dd> + <ul> + <li>Temporary work-around to resolve the rare cases in which the layout editor will +not open.</li> + <li>Fix issue in which ADT 10.0.0 would install on Eclipse 3.4 and lower, even though ADT +requires Eclipse 3.5 or higher (as of 10.0.0).</li> + </ul> +</dd> +</dl> +</div> +</div> + + + +<div class="toggleable closed"> + <a href="#" onclick="return toggleDiv(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px" +width="9px" /> ADT 10.0.0</a> <em>(February 2011)</em> <div class="toggleme"> diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs index a1c26db..6b9a5ce 100644 --- a/docs/html/sdk/sdk_toc.cs +++ b/docs/html/sdk/sdk_toc.cs @@ -129,7 +129,7 @@ class="new">new!</span></li> <span style="display:none" class="zh-TW"></span> </h2> <ul> - <li><a href="<?cs var:toroot ?>sdk/eclipse-adt.html">ADT 10.0.0 + <li><a href="<?cs var:toroot ?>sdk/eclipse-adt.html">ADT 10.0.1 <span style="display:none" class="de"></span> <span style="display:none" class="es"></span> <span style="display:none" class="fr"></span> diff --git a/drm/common/DrmSupportInfo.cpp b/drm/common/DrmSupportInfo.cpp index 3e02093..c0bff0e 100644 --- a/drm/common/DrmSupportInfo.cpp +++ b/drm/common/DrmSupportInfo.cpp @@ -45,7 +45,7 @@ bool DrmSupportInfo::isSupportedMimeType(const String8& mimeType) const { for (unsigned int i = 0; i < mMimeTypeVector.size(); i++) { const String8 item = mMimeTypeVector.itemAt(i); - if (String8("") != mimeType && item.find(mimeType) != -1) { + if (!strcasecmp(item.string(), mimeType.string())) { return true; } } @@ -56,7 +56,7 @@ bool DrmSupportInfo::isSupportedFileSuffix(const String8& fileType) const { for (unsigned int i = 0; i < mFileSuffixVector.size(); i++) { const String8 item = mFileSuffixVector.itemAt(i); - if (item.find(fileType) != -1) { + if (!strcasecmp(item.string(), fileType.string())) { return true; } } diff --git a/drm/drmserver/Android.mk b/drm/drmserver/Android.mk index 5df2ff8..e3cd44f 100644 --- a/drm/drmserver/Android.mk +++ b/drm/drmserver/Android.mk @@ -19,10 +19,10 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ main_drmserver.cpp \ DrmManager.cpp \ - DrmManagerService.cpp \ - StringTokenizer.cpp + DrmManagerService.cpp LOCAL_SHARED_LIBRARIES := \ + libmedia \ libutils \ libbinder diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp index 1eee5f2..2fee59c 100644 --- a/drm/drmserver/DrmManager.cpp +++ b/drm/drmserver/DrmManager.cpp @@ -37,7 +37,6 @@ using namespace android; -Vector<int> DrmManager::mUniqueIdVector; const String8 DrmManager::EMPTY_STRING(""); DrmManager::DrmManager() : diff --git a/drm/drmserver/DrmManagerService.cpp b/drm/drmserver/DrmManagerService.cpp index 0901a44..583669e 100644 --- a/drm/drmserver/DrmManagerService.cpp +++ b/drm/drmserver/DrmManagerService.cpp @@ -19,6 +19,7 @@ #include <utils/Log.h> #include <private/android_filesystem_config.h> +#include <media/MemoryLeakTrackUtil.h> #include <errno.h> #include <utils/threads.h> @@ -256,3 +257,31 @@ ssize_t DrmManagerService::pread(int uniqueId, DecryptHandle* decryptHandle, return mDrmManager->pread(uniqueId, decryptHandle, buffer, numBytes, offset); } +status_t DrmManagerService::dump(int fd, const Vector<String16>& args) +{ + const size_t SIZE = 256; + char buffer[SIZE]; + String8 result; + if (checkCallingPermission(String16("android.permission.DUMP")) == false) { + snprintf(buffer, SIZE, "Permission Denial: " + "can't dump DrmManagerService from pid=%d, uid=%d\n", + IPCThreadState::self()->getCallingPid(), + IPCThreadState::self()->getCallingUid()); + result.append(buffer); + } else { +#if DRM_MEMORY_LEAK_TRACK + bool dumpMem = false; + for (size_t i = 0; i < args.size(); i++) { + if (args[i] == String16("-m")) { + dumpMem = true; + } + } + if (dumpMem) { + dumpMemoryAddresses(fd); + } +#endif + } + write(fd, result.string(), result.size()); + return NO_ERROR; +} + diff --git a/drm/drmserver/StringTokenizer.cpp b/drm/drmserver/StringTokenizer.cpp deleted file mode 100644 index 2130a00..0000000 --- a/drm/drmserver/StringTokenizer.cpp +++ /dev/null @@ -1,66 +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 "StringTokenizer.h" - -using namespace android; - -StringTokenizer::StringTokenizer(const String8& string, const String8& delimiter) { - splitString(string, delimiter); -} - -void StringTokenizer::splitString(const String8& string, const String8& delimiter) { - for (unsigned int i = 0; i < string.length(); i++) { - unsigned int position = string.find(delimiter.string(), i); - if (string.length() != position) { - String8 token(string.string()+i, position-i); - if (token.length()) { - mStringTokenizerVector.push(token); - i = position + delimiter.length() - 1; - } - } else { - mStringTokenizerVector.push(String8(string.string()+i, string.length()-i)); - break; - } - } -} - -StringTokenizer::Iterator StringTokenizer::iterator() { - return Iterator(this); -} - -StringTokenizer::Iterator::Iterator(const StringTokenizer::Iterator& iterator) : - mStringTokenizer(iterator.mStringTokenizer), - mIndex(iterator.mIndex) { -} - -StringTokenizer::Iterator& StringTokenizer::Iterator::operator=( - const StringTokenizer::Iterator& iterator) { - mStringTokenizer = iterator.mStringTokenizer; - mIndex = iterator.mIndex; - return *this; -} - -bool StringTokenizer::Iterator::hasNext() { - return mIndex < mStringTokenizer->mStringTokenizerVector.size(); -} - -String8& StringTokenizer::Iterator::next() { - String8& value = mStringTokenizer->mStringTokenizerVector.editItemAt(mIndex); - mIndex++; - return value; -} - diff --git a/drm/java/android/drm/DrmErrorEvent.java b/drm/java/android/drm/DrmErrorEvent.java index 20fd8aa..90adb47f 100644 --- a/drm/java/android/drm/DrmErrorEvent.java +++ b/drm/java/android/drm/DrmErrorEvent.java @@ -53,6 +53,10 @@ public class DrmErrorEvent extends DrmEvent { * associated with all DRM schemes. */ public static final int TYPE_REMOVE_ALL_RIGHTS_FAILED = 2007; + /** + * TYPE_ACQUIRE_DRM_INFO_FAILED, when failed to acquire DrmInfo. + */ + public static final int TYPE_ACQUIRE_DRM_INFO_FAILED = 2008; /** * constructor to create DrmErrorEvent object with given parameters diff --git a/drm/java/android/drm/DrmInfoEvent.java b/drm/java/android/drm/DrmInfoEvent.java index a778e06..72f37ea 100644 --- a/drm/java/android/drm/DrmInfoEvent.java +++ b/drm/java/android/drm/DrmInfoEvent.java @@ -45,6 +45,10 @@ public class DrmInfoEvent extends DrmEvent { * already done for the given account. */ public static final int TYPE_ACCOUNT_ALREADY_REGISTERED = 5; + /** + * TYPE_RIGHTS_REMOVED, when the rights has been removed. + */ + public static final int TYPE_RIGHTS_REMOVED = 6; /** * constructor to create DrmInfoEvent object with given parameters diff --git a/drm/java/android/drm/DrmInfoRequest.java b/drm/java/android/drm/DrmInfoRequest.java index a5a799c..366a342 100644 --- a/drm/java/android/drm/DrmInfoRequest.java +++ b/drm/java/android/drm/DrmInfoRequest.java @@ -28,7 +28,7 @@ import java.util.Iterator; * */ public class DrmInfoRequest { - // Changes in following constants should be in sync with DrmInfoRequest.cpp + // Changes in following constants should be in sync with DrmInfoRequest.h /** * Constants defines the type of {@link DrmInfoRequest} */ diff --git a/drm/java/android/drm/DrmManagerClient.java b/drm/java/android/drm/DrmManagerClient.java index 782ffdb..aa56159 100644 --- a/drm/java/android/drm/DrmManagerClient.java +++ b/drm/java/android/drm/DrmManagerClient.java @@ -181,7 +181,7 @@ public class DrmManagerClient { } public void handleMessage(Message msg) { - DrmInfoEvent event = null; + DrmInfoEvent info = null; DrmErrorEvent error = null; switch (msg.what) { @@ -197,11 +197,15 @@ public class DrmManagerClient { } catch (IOException e) { e.printStackTrace(); } - event = new DrmInfoEvent(uniqueId, infoType, message); + info = new DrmInfoEvent(uniqueId, infoType, message); break; } - case DrmInfoEvent.TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNT: { - event = new DrmInfoEvent(uniqueId, infoType, message); + case DrmInfoEvent.TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNT: + case DrmInfoEvent.TYPE_RIGHTS_INSTALLED: + case DrmInfoEvent.TYPE_WAIT_FOR_RIGHTS: + case DrmInfoEvent.TYPE_ACCOUNT_ALREADY_REGISTERED: + case DrmInfoEvent.TYPE_RIGHTS_REMOVED: { + info = new DrmInfoEvent(uniqueId, infoType, message); break; } default: @@ -209,8 +213,8 @@ public class DrmManagerClient { break; } - if (null != mOnInfoListener && null != event) { - mOnInfoListener.onInfo(DrmManagerClient.this, event); + if (null != mOnInfoListener && null != info) { + mOnInfoListener.onInfo(DrmManagerClient.this, info); } if (null != mOnErrorListener && null != error) { mOnErrorListener.onError(DrmManagerClient.this, error); diff --git a/drm/jni/Android.mk b/drm/jni/Android.mk index b65e4da..69bb48d 100644 --- a/drm/jni/Android.mk +++ b/drm/jni/Android.mk @@ -42,7 +42,7 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/base/drm/libdrmframework/plugins/common/include \ $(TOP)/frameworks/base/include -LOCAL_PRELINK_MODULE := false + LOCAL_MODULE_TAGS := optional diff --git a/drm/libdrmframework/Android.mk b/drm/libdrmframework/Android.mk index 99133ba..f1526a4 100644 --- a/drm/libdrmframework/Android.mk +++ b/drm/libdrmframework/Android.mk @@ -40,7 +40,7 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/base/drm/libdrmframework/include \ $(TOP)/frameworks/base/include -LOCAL_PRELINK_MODULE := false + LOCAL_MODULE_TAGS := optional diff --git a/drm/libdrmframework/DrmManagerClientImpl.cpp b/drm/libdrmframework/DrmManagerClientImpl.cpp index e6ae220..a57dd98 100644 --- a/drm/libdrmframework/DrmManagerClientImpl.cpp +++ b/drm/libdrmframework/DrmManagerClientImpl.cpp @@ -28,8 +28,9 @@ using namespace android; #define INVALID_VALUE -1 -Mutex DrmManagerClientImpl::mMutex; -sp<IDrmManagerService> DrmManagerClientImpl::mDrmManagerService; +Mutex DrmManagerClientImpl::sMutex; +sp<IDrmManagerService> DrmManagerClientImpl::sDrmManagerService; +sp<DrmManagerClientImpl::DeathNotifier> DrmManagerClientImpl::sDeathNotifier; const String8 DrmManagerClientImpl::EMPTY_STRING(""); DrmManagerClientImpl* DrmManagerClientImpl::create(int* pUniqueId) { @@ -47,8 +48,8 @@ void DrmManagerClientImpl::remove(int uniqueId) { } const sp<IDrmManagerService>& DrmManagerClientImpl::getDrmManagerService() { - mMutex.lock(); - if (NULL == mDrmManagerService.get()) { + Mutex::Autolock lock(sMutex); + if (NULL == sDrmManagerService.get()) { sp<IServiceManager> sm = defaultServiceManager(); sp<IBinder> binder; do { @@ -62,11 +63,13 @@ const sp<IDrmManagerService>& DrmManagerClientImpl::getDrmManagerService() { reqt.tv_nsec = 500000000; //0.5 sec nanosleep(&reqt, NULL); } while (true); - - mDrmManagerService = interface_cast<IDrmManagerService>(binder); + if (NULL == sDeathNotifier.get()) { + sDeathNotifier = new DeathNotifier(); + } + binder->linkToDeath(sDeathNotifier); + sDrmManagerService = interface_cast<IDrmManagerService>(binder); } - mMutex.unlock(); - return mDrmManagerService; + return sDrmManagerService; } void DrmManagerClientImpl::addClient(int uniqueId) { @@ -143,11 +146,8 @@ DrmInfo* DrmManagerClientImpl::acquireDrmInfo( status_t DrmManagerClientImpl::saveRights(int uniqueId, const DrmRights& drmRights, const String8& rightsPath, const String8& contentPath) { status_t status = DRM_ERROR_UNKNOWN; - if (EMPTY_STRING != contentPath) { - status = getDrmManagerService()->saveRights( + return getDrmManagerService()->saveRights( uniqueId, drmRights, rightsPath, contentPath); - } - return status; } String8 DrmManagerClientImpl::getOriginalMimeType( @@ -336,3 +336,16 @@ status_t DrmManagerClientImpl::notify(const DrmInfoEvent& event) { return DRM_NO_ERROR; } +DrmManagerClientImpl::DeathNotifier::~DeathNotifier() { + Mutex::Autolock lock(sMutex); + if (NULL != sDrmManagerService.get()) { + sDrmManagerService->asBinder()->unlinkToDeath(this); + } +} + +void DrmManagerClientImpl::DeathNotifier::binderDied(const wp<IBinder>& who) { + Mutex::Autolock lock(sMutex); + DrmManagerClientImpl::sDrmManagerService.clear(); + LOGW("DrmManager server died!"); +} + diff --git a/drm/libdrmframework/include/DrmManager.h b/drm/libdrmframework/include/DrmManager.h index c7276f9..af2c2a8 100644 --- a/drm/libdrmframework/include/DrmManager.h +++ b/drm/libdrmframework/include/DrmManager.h @@ -30,7 +30,6 @@ class IDrmManager; class DrmRegistrationInfo; class DrmUnregistrationInfo; class DrmRightsAcquisitionInfo; -class DrmContentIds; class DrmConstraints; class DrmMetadata; class DrmRights; @@ -141,7 +140,7 @@ private: bool canHandle(int uniqueId, const String8& path); private: - static Vector<int> mUniqueIdVector; + Vector<int> mUniqueIdVector; static const String8 EMPTY_STRING; int mDecryptSessionId; diff --git a/drm/libdrmframework/include/DrmManagerClientImpl.h b/drm/libdrmframework/include/DrmManagerClientImpl.h index 0cba8d4..564896b 100644 --- a/drm/libdrmframework/include/DrmManagerClientImpl.h +++ b/drm/libdrmframework/include/DrmManagerClientImpl.h @@ -407,9 +407,17 @@ private: Mutex mLock; sp<DrmManagerClient::OnInfoListener> mOnInfoListener; + class DeathNotifier: public IBinder::DeathRecipient { + public: + DeathNotifier() {} + virtual ~DeathNotifier(); + virtual void binderDied(const wp<IBinder>& who); + }; + private: - static Mutex mMutex; - static sp<IDrmManagerService> mDrmManagerService; + static Mutex sMutex; + static sp<DeathNotifier> sDeathNotifier; + static sp<IDrmManagerService> sDrmManagerService; static const sp<IDrmManagerService>& getDrmManagerService(); static const String8 EMPTY_STRING; }; diff --git a/drm/libdrmframework/include/DrmManagerService.h b/drm/libdrmframework/include/DrmManagerService.h index d0a0db7..227496a 100644 --- a/drm/libdrmframework/include/DrmManagerService.h +++ b/drm/libdrmframework/include/DrmManagerService.h @@ -115,6 +115,8 @@ public: ssize_t pread(int uniqueId, DecryptHandle* decryptHandle, void* buffer, ssize_t numBytes, off64_t offset); + virtual status_t dump(int fd, const Vector<String16>& args); + private: DrmManager* mDrmManager; }; diff --git a/drm/libdrmframework/include/IDrmManagerService.h b/drm/libdrmframework/include/IDrmManagerService.h index 2424ea5..7727e55 100644 --- a/drm/libdrmframework/include/IDrmManagerService.h +++ b/drm/libdrmframework/include/IDrmManagerService.h @@ -25,7 +25,6 @@ namespace android { -class DrmContentIds; class DrmConstraints; class DrmMetadata; class DrmRights; diff --git a/drm/libdrmframework/include/PlugInManager.h b/drm/libdrmframework/include/PlugInManager.h index 9ad195f..8029138 100644 --- a/drm/libdrmframework/include/PlugInManager.h +++ b/drm/libdrmframework/include/PlugInManager.h @@ -230,11 +230,9 @@ private: */ bool isPlugIn(const struct dirent* pEntry) const { String8 sName(pEntry->d_name); - int extentionPos = sName.size() - String8(PLUGIN_EXTENSION).size(); - if (extentionPos < 0) { - return false; - } - return extentionPos == (int)sName.find(PLUGIN_EXTENSION); + String8 extension(sName.getPathExtension()); + // Note that the plug-in extension must exactly match case + return extension == String8(PLUGIN_EXTENSION); } /** diff --git a/drm/libdrmframework/include/StringTokenizer.h b/drm/libdrmframework/include/StringTokenizer.h deleted file mode 100644 index 70e7558..0000000 --- a/drm/libdrmframework/include/StringTokenizer.h +++ /dev/null @@ -1,87 +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 __STRING_TOKENIZER_H__ -#define __STRING_TOKENIZER_H__ - -#include <drm/drm_framework_common.h> - -namespace android { - -/** - * This is an utility class for String manipulation. - * - */ -class StringTokenizer { -public: - /** - * Iterator for string tokens - */ - class Iterator { - friend class StringTokenizer; - private: - Iterator(StringTokenizer* StringTokenizer) - : mStringTokenizer(StringTokenizer), mIndex(0) {} - - public: - Iterator(const Iterator& iterator); - Iterator& operator=(const Iterator& iterator); - virtual ~Iterator() {} - - public: - bool hasNext(); - String8& next(); - - private: - StringTokenizer* mStringTokenizer; - unsigned int mIndex; - }; - -public: - /** - * Constructor for StringTokenizer - * - * @param[in] string Complete string data - * @param[in] delimeter Delimeter used to split the string - */ - StringTokenizer(const String8& string, const String8& delimeter); - - /** - * Destructor for StringTokenizer - */ - ~StringTokenizer() {} - -private: - /** - * Splits the string according to the delimeter - */ - void splitString(const String8& string, const String8& delimeter); - -public: - /** - * Returns Iterator object to walk through the split string values - * - * @return Iterator object - */ - Iterator iterator(); - -private: - Vector<String8> mStringTokenizerVector; -}; - -}; -#endif /* __STRING_TOKENIZER_H__ */ - diff --git a/drm/libdrmframework/plugins/common/include/IDrmEngine.h b/drm/libdrmframework/plugins/common/include/IDrmEngine.h index d05c24f..77460f6 100644 --- a/drm/libdrmframework/plugins/common/include/IDrmEngine.h +++ b/drm/libdrmframework/plugins/common/include/IDrmEngine.h @@ -21,7 +21,6 @@ namespace android { -class DrmContentIds; class DrmConstraints; class DrmMetadata; class DrmRights; diff --git a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk index af67aa3..9805a40 100644 --- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk +++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk @@ -47,7 +47,7 @@ LOCAL_STATIC_LIBRARIES := \ libfwdlock-converter \ libfwdlock-decoder -LOCAL_PRELINK_MODULE := false + LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ diff --git a/drm/libdrmframework/plugins/passthru/Android.mk b/drm/libdrmframework/plugins/passthru/Android.mk index 7856d37..be18b64 100644 --- a/drm/libdrmframework/plugins/passthru/Android.mk +++ b/drm/libdrmframework/plugins/passthru/Android.mk @@ -32,7 +32,7 @@ else LOCAL_SHARED_LIBRARIES += libdl endif -LOCAL_PRELINK_MODULE := false + LOCAL_C_INCLUDES += \ $(TOP)/frameworks/base/drm/libdrmframework/include \ diff --git a/include/drm/DrmInfoEvent.h b/include/drm/DrmInfoEvent.h index 7b409ff..add33d3 100644 --- a/include/drm/DrmInfoEvent.h +++ b/include/drm/DrmInfoEvent.h @@ -43,6 +43,8 @@ public: //! TYPE_ACCOUNT_ALREADY_REGISTERED, when registration has been //! already done for the given account. static const int TYPE_ACCOUNT_ALREADY_REGISTERED = 5; + //! TYPE_RIGHTS_REMOVED, when the rights has been removed. + static const int TYPE_RIGHTS_REMOVED = 6; /** * The following constant values should be in sync with DrmErrorEvent.java @@ -61,6 +63,11 @@ public: static const int TYPE_NO_INTERNET_CONNECTION = 2005; //! TYPE_PROCESS_DRM_INFO_FAILED, when failed to process DrmInfo. static const int TYPE_PROCESS_DRM_INFO_FAILED = 2006; + //! TYPE_REMOVE_ALL_RIGHTS_FAILED, when failed to remove all the rights objects + //! associated with all DRM schemes. + static const int TYPE_REMOVE_ALL_RIGHTS_FAILED = 2007; + //! TYPE_ACQUIRE_DRM_INFO_FAILED, when failed to acquire DrmInfo. + static const int TYPE_ACQUIRE_DRM_INFO_FAILED = 2008; public: /** diff --git a/include/gui/SurfaceTextureClient.h b/include/gui/SurfaceTextureClient.h index 4cdece9..7992105 100644 --- a/include/gui/SurfaceTextureClient.h +++ b/include/gui/SurfaceTextureClient.h @@ -33,6 +33,8 @@ class SurfaceTextureClient public: SurfaceTextureClient(const sp<ISurfaceTexture>& surfaceTexture); + sp<ISurfaceTexture> getISurfaceTexture() const; + private: // can't be copied diff --git a/include/media/MemoryLeakTrackUtil.h b/include/media/MemoryLeakTrackUtil.h new file mode 100644 index 0000000..290b748 --- /dev/null +++ b/include/media/MemoryLeakTrackUtil.h @@ -0,0 +1,28 @@ + +/* + * Copyright 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 MEMORY_LEAK_TRACK_UTIL_H +#define MEMORY_LEAK_TRACK_UTIL_H + +namespace android { +/* + * Dump the memory adddress of the calling process to the given fd. + */ +extern void dumpMemoryAddresses(int fd); + +}; + +#endif // MEMORY_LEAK_TRACK_UTIL_H diff --git a/include/ui/egl/android_natives.h b/include/ui/egl/android_natives.h index 0ac34d0..0fc1ddf 100644 --- a/include/ui/egl/android_natives.h +++ b/include/ui/egl/android_natives.h @@ -110,6 +110,14 @@ enum { * conjunction with this query. */ NATIVE_WINDOW_QUEUES_TO_WINDOW_COMPOSER, + + /* Get the concrete type of a ANativeWindow. See below for the list of + * possible return values. + * + * This query should not be used outside the Android framework and will + * likely be removed in the near future. + */ + NATIVE_WINDOW_CONCRETE_TYPE, }; /* valid operations for the (*perform)() hook */ @@ -142,6 +150,13 @@ enum { NATIVE_WINDOW_TRANSFORM_ROT_270 = HAL_TRANSFORM_ROT_270, }; +/* values returned by the NATIVE_WINDOW_CONCRETE_TYPE query */ +enum { + NATIVE_WINDOW_FRAMEBUFFER, // FramebufferNativeWindow + NATIVE_WINDOW_SURFACE, // Surface + NATIVE_WINDOW_SURFACE_TEXTURE_CLIENT, // SurfaceTextureClient +}; + struct ANativeWindow { #ifdef __cplusplus diff --git a/include/utils/String8.h b/include/utils/String8.h index 6b49ff5..4163697 100644 --- a/include/utils/String8.h +++ b/include/utils/String8.h @@ -165,8 +165,8 @@ public: String8 walkPath(String8* outRemains = NULL) const; /* - * Return the filename extension. This is the last '.' and up to - * four characters that follow it. The '.' is included in case we + * Return the filename extension. This is the last '.' and any number + * of characters that follow it. The '.' is included in case we * decide to expand our definition of what constitutes an extension. * * "/tmp/foo/bar.c" --> ".c" diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index 3bed959..5c6d71b 100644 --- a/libs/gui/SurfaceTexture.cpp +++ b/libs/gui/SurfaceTexture.cpp @@ -283,11 +283,42 @@ void SurfaceTexture::getTransformMatrix(float mtx[16]) { sp<GraphicBuffer>& buf(mSlots[mCurrentTexture].mGraphicBuffer); float tx, ty, sx, sy; if (!mCurrentCrop.isEmpty()) { - tx = float(mCurrentCrop.left) / float(buf->getWidth()); - ty = float(buf->getHeight() - mCurrentCrop.bottom) / - float(buf->getHeight()); - sx = float(mCurrentCrop.width()) / float(buf->getWidth()); - sy = float(mCurrentCrop.height()) / float(buf->getHeight()); + // In order to prevent bilinear sampling at the of the crop rectangle we + // may need to shrink it by 2 texels in each direction. Normally this + // would just need to take 1/2 a texel off each end, but because the + // chroma channels will likely be subsampled we need to chop off a whole + // texel. This will cause artifacts if someone does nearest sampling + // with 1:1 pixel:texel ratio, but it's impossible to simultaneously + // accomodate the bilinear and nearest sampling uses. + // + // If nearest sampling turns out to be a desirable usage of these + // textures then we could add the ability to switch a SurfaceTexture to + // nearest-mode. Preferably, however, the image producers (video + // decoder, camera, etc.) would simply not use a crop rectangle (or at + // least not tell the framework about it) so that the GPU can do the + // correct edge behavior. + int xshrink = 0, yshrink = 0; + if (mCurrentCrop.left > 0) { + tx = float(mCurrentCrop.left + 1) / float(buf->getWidth()); + xshrink++; + } else { + tx = 0.0f; + } + if (mCurrentCrop.right < buf->getWidth()) { + xshrink++; + } + if (mCurrentCrop.bottom < buf->getHeight()) { + ty = (float(buf->getHeight() - mCurrentCrop.bottom) + 1.0f) / + float(buf->getHeight()); + yshrink++; + } else { + ty = 0.0f; + } + if (mCurrentCrop.top > 0) { + yshrink++; + } + sx = float(mCurrentCrop.width() - xshrink) / float(buf->getWidth()); + sy = float(mCurrentCrop.height() - yshrink) / float(buf->getHeight()); } else { tx = 0.0f; ty = 0.0f; @@ -298,7 +329,7 @@ void SurfaceTexture::getTransformMatrix(float mtx[16]) { sx, 0, 0, 0, 0, sy, 0, 0, 0, 0, 1, 0, - sx*tx, sy*ty, 0, 1, + tx, ty, 0, 1, }; float mtxBeforeFlipV[16]; diff --git a/libs/gui/SurfaceTextureClient.cpp b/libs/gui/SurfaceTextureClient.cpp index a40fac9..7f1d9cb 100644 --- a/libs/gui/SurfaceTextureClient.cpp +++ b/libs/gui/SurfaceTextureClient.cpp @@ -40,6 +40,10 @@ SurfaceTextureClient::SurfaceTextureClient( mAllocator = mSurfaceTexture->getAllocator(); } +sp<ISurfaceTexture> SurfaceTextureClient::getISurfaceTexture() const { + return mSurfaceTexture; +} + int SurfaceTextureClient::setSwapInterval(ANativeWindow* window, int interval) { SurfaceTextureClient* c = getSelf(window); return c->setSwapInterval(interval); @@ -160,6 +164,9 @@ int SurfaceTextureClient::query(int what, int* value) { // SurfaceTextureClient currently never queues frames to SurfaceFlinger. *value = 0; return NO_ERROR; + case NATIVE_WINDOW_CONCRETE_TYPE: + *value = NATIVE_WINDOW_SURFACE_TEXTURE_CLIENT; + return NO_ERROR; } return BAD_VALUE; } diff --git a/libs/gui/tests/Android.mk b/libs/gui/tests/Android.mk index 1dd8885..7516299 100644 --- a/libs/gui/tests/Android.mk +++ b/libs/gui/tests/Android.mk @@ -4,39 +4,37 @@ include $(CLEAR_VARS) ifneq ($(TARGET_SIMULATOR),true) -# Build the unit tests. -test_src_files := \ +LOCAL_MODULE := SurfaceTexture_test + +LOCAL_MODULE_TAGS := tests + +LOCAL_SRC_FILES := \ SurfaceTextureClient_test.cpp \ + SurfaceTexture_test.cpp \ -shared_libraries := \ - libcutils \ - libutils \ +LOCAL_SHARED_LIBRARIES := \ + libEGL \ + libGLESv2 \ + libandroid \ libbinder \ + libcutils \ libgui \ libstlport \ + libsurfaceflinger_client \ + libui \ + libutils \ -static_libraries := \ +LOCAL_STATIC_LIBRARIES := \ libgtest \ libgtest_main \ -c_includes := \ +LOCAL_C_INCLUDES := \ bionic \ bionic/libstdc++/include \ external/gtest/include \ external/stlport/stlport \ -module_tags := tests - -$(foreach file,$(test_src_files), \ - $(eval include $(CLEAR_VARS)) \ - $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ - $(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \ - $(eval LOCAL_C_INCLUDES := $(c_includes)) \ - $(eval LOCAL_SRC_FILES := $(file)) \ - $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ - $(eval LOCAL_MODULE_TAGS := $(module_tags)) \ - $(eval include $(BUILD_EXECUTABLE)) \ -) +include $(BUILD_EXECUTABLE) # Build the manual test programs. include $(call all-subdir-makefiles) diff --git a/libs/gui/tests/SurfaceTextureClient_test.cpp b/libs/gui/tests/SurfaceTextureClient_test.cpp index 0f140ff..94b05bc 100644 --- a/libs/gui/tests/SurfaceTextureClient_test.cpp +++ b/libs/gui/tests/SurfaceTextureClient_test.cpp @@ -14,8 +14,9 @@ * limitations under the License. */ -#include <gui/SurfaceTextureClient.h> +#include <EGL/egl.h> #include <gtest/gtest.h> +#include <gui/SurfaceTextureClient.h> namespace android { @@ -35,6 +36,11 @@ protected: sp<SurfaceTextureClient> mSTC; }; +TEST_F(SurfaceTextureClientTest, GetISurfaceTextureIsNotNull) { + sp<ISurfaceTexture> ist(mSTC->getISurfaceTexture()); + ASSERT_TRUE(ist != NULL); +} + TEST_F(SurfaceTextureClientTest, QueuesToWindowCompositorIsFalse) { sp<ANativeWindow> anw(mSTC); int result = -123; @@ -44,4 +50,54 @@ TEST_F(SurfaceTextureClientTest, QueuesToWindowCompositorIsFalse) { EXPECT_EQ(0, result); } +TEST_F(SurfaceTextureClientTest, ConcreteTypeIsSurfaceTextureClient) { + sp<ANativeWindow> anw(mSTC); + int result = -123; + int err = anw->query(anw.get(), NATIVE_WINDOW_CONCRETE_TYPE, &result); + EXPECT_EQ(NO_ERROR, err); + EXPECT_EQ(NATIVE_WINDOW_SURFACE_TEXTURE_CLIENT, result); +} + +TEST_F(SurfaceTextureClientTest, ANativeWindowLockFails) { + sp<ANativeWindow> anw(mSTC); + ANativeWindow_Buffer buf; + ASSERT_EQ(BAD_VALUE, ANativeWindow_lock(anw.get(), &buf, NULL)); +} + +TEST_F(SurfaceTextureClientTest, EglCreateWindowSurfaceFails) { + sp<ANativeWindow> anw(mSTC); + + EGLDisplay dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY); + ASSERT_EQ(EGL_SUCCESS, eglGetError()); + ASSERT_NE(EGL_NO_DISPLAY, dpy); + + EGLint majorVersion; + EGLint minorVersion; + EXPECT_TRUE(eglInitialize(dpy, &majorVersion, &minorVersion)); + ASSERT_EQ(EGL_SUCCESS, eglGetError()); + + EGLConfig myConfig = {0}; + EGLint numConfigs = 0; + EGLint configAttribs[] = { + EGL_SURFACE_TYPE, EGL_WINDOW_BIT, + EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, + EGL_RED_SIZE, 8, + EGL_GREEN_SIZE, 8, + EGL_BLUE_SIZE, 8, + EGL_ALPHA_SIZE, 8, + EGL_DEPTH_SIZE, 16, + EGL_STENCIL_SIZE, 8, + EGL_NONE }; + EXPECT_TRUE(eglChooseConfig(dpy, configAttribs, &myConfig, 1, + &numConfigs)); + ASSERT_EQ(EGL_SUCCESS, eglGetError()); + + EGLSurface eglSurface = eglCreateWindowSurface(dpy, myConfig, anw.get(), + NULL); + ASSERT_EQ(EGL_NO_SURFACE, eglSurface); + ASSERT_EQ(EGL_BAD_NATIVE_WINDOW, eglGetError()); + + eglTerminate(dpy); +} + } diff --git a/libs/gui/tests/SurfaceTexture_test.cpp b/libs/gui/tests/SurfaceTexture_test.cpp new file mode 100644 index 0000000..4184463 --- /dev/null +++ b/libs/gui/tests/SurfaceTexture_test.cpp @@ -0,0 +1,621 @@ +/* + * 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 <gtest/gtest.h> +#include <gui/SurfaceTexture.h> +#include <gui/SurfaceTextureClient.h> +#include <ui/GraphicBuffer.h> +#include <utils/String8.h> + +#include <surfaceflinger/ISurfaceComposer.h> +#include <surfaceflinger/Surface.h> +#include <surfaceflinger/SurfaceComposerClient.h> + +#include <EGL/egl.h> +#include <EGL/eglext.h> +#include <GLES2/gl2.h> +#include <GLES2/gl2ext.h> + +#include <ui/FramebufferNativeWindow.h> + +namespace android { + +class GLTest : public ::testing::Test { +protected: + + GLTest(): + mEglDisplay(EGL_NO_DISPLAY), + mEglSurface(EGL_NO_SURFACE), + mEglContext(EGL_NO_CONTEXT) { + } + + virtual void SetUp() { + EGLBoolean returnValue; + + mEglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY); + ASSERT_EQ(EGL_SUCCESS, eglGetError()); + ASSERT_NE(EGL_NO_DISPLAY, mEglDisplay); + + EGLint majorVersion; + EGLint minorVersion; + EXPECT_TRUE(eglInitialize(mEglDisplay, &majorVersion, &minorVersion)); + ASSERT_EQ(EGL_SUCCESS, eglGetError()); + RecordProperty("EglVersionMajor", majorVersion); + RecordProperty("EglVersionMajor", minorVersion); + + EGLConfig myConfig = {0}; + EGLint numConfigs = 0; + EXPECT_TRUE(eglChooseConfig(mEglDisplay, getConfigAttribs(), &myConfig, + 1, &numConfigs)); + ASSERT_EQ(EGL_SUCCESS, eglGetError()); + + char* displaySecsEnv = getenv("GLTEST_DISPLAY_SECS"); + if (displaySecsEnv != NULL) { + mDisplaySecs = atoi(displaySecsEnv); + if (mDisplaySecs < 0) { + mDisplaySecs = 0; + } + } else { + mDisplaySecs = 0; + } + + if (mDisplaySecs > 0) { + mComposerClient = new SurfaceComposerClient; + ASSERT_EQ(NO_ERROR, mComposerClient->initCheck()); + + mSurfaceControl = mComposerClient->createSurface(getpid(), + String8("Test Surface"), 0, + getSurfaceWidth(), getSurfaceHeight(), + PIXEL_FORMAT_RGB_888, 0); + + ASSERT_TRUE(mSurfaceControl != NULL); + ASSERT_TRUE(mSurfaceControl->isValid()); + + ASSERT_EQ(NO_ERROR, mComposerClient->openTransaction()); + ASSERT_EQ(NO_ERROR, mSurfaceControl->setLayer(30000)); + ASSERT_EQ(NO_ERROR, mSurfaceControl->show()); + ASSERT_EQ(NO_ERROR, mComposerClient->closeTransaction()); + + sp<ANativeWindow> window = mSurfaceControl->getSurface(); + mEglSurface = eglCreateWindowSurface(mEglDisplay, myConfig, + window.get(), NULL); + } else { + EGLint pbufferAttribs[] = { + EGL_WIDTH, getSurfaceWidth(), + EGL_HEIGHT, getSurfaceHeight(), + EGL_NONE }; + + mEglSurface = eglCreatePbufferSurface(mEglDisplay, myConfig, + pbufferAttribs); + } + ASSERT_EQ(EGL_SUCCESS, eglGetError()); + ASSERT_NE(EGL_NO_SURFACE, mEglSurface); + + mEglContext = eglCreateContext(mEglDisplay, myConfig, EGL_NO_CONTEXT, + getContextAttribs()); + ASSERT_EQ(EGL_SUCCESS, eglGetError()); + ASSERT_NE(EGL_NO_CONTEXT, mEglContext); + + EXPECT_TRUE(eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface, + mEglContext)); + ASSERT_EQ(EGL_SUCCESS, eglGetError()); + + EGLint w, h; + EXPECT_TRUE(eglQuerySurface(mEglDisplay, mEglSurface, EGL_WIDTH, &w)); + ASSERT_EQ(EGL_SUCCESS, eglGetError()); + EXPECT_TRUE(eglQuerySurface(mEglDisplay, mEglSurface, EGL_HEIGHT, &h)); + ASSERT_EQ(EGL_SUCCESS, eglGetError()); + RecordProperty("EglSurfaceWidth", w); + RecordProperty("EglSurfaceHeight", h); + + glViewport(0, 0, w, h); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); + } + + virtual void TearDown() { + // Display the result + if (mDisplaySecs > 0 && mEglSurface != EGL_NO_SURFACE) { + eglSwapBuffers(mEglDisplay, mEglSurface); + sleep(mDisplaySecs); + } + + if (mComposerClient != NULL) { + mComposerClient->dispose(); + } + if (mEglContext != EGL_NO_CONTEXT) { + eglDestroyContext(mEglDisplay, mEglContext); + } + if (mEglSurface != EGL_NO_SURFACE) { + eglDestroySurface(mEglDisplay, mEglSurface); + } + if (mEglDisplay != EGL_NO_DISPLAY) { + eglMakeCurrent(mEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, + EGL_NO_CONTEXT); + eglTerminate(mEglDisplay); + } + ASSERT_EQ(EGL_SUCCESS, eglGetError()); + } + + virtual EGLint const* getConfigAttribs() { + static EGLint sDefaultConfigAttribs[] = { + EGL_SURFACE_TYPE, EGL_PBUFFER_BIT, + EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, + EGL_RED_SIZE, 8, + EGL_GREEN_SIZE, 8, + EGL_BLUE_SIZE, 8, + EGL_ALPHA_SIZE, 8, + EGL_DEPTH_SIZE, 16, + EGL_STENCIL_SIZE, 8, + EGL_NONE }; + + return sDefaultConfigAttribs; + } + + virtual EGLint const* getContextAttribs() { + static EGLint sDefaultContextAttribs[] = { + EGL_CONTEXT_CLIENT_VERSION, 2, + EGL_NONE }; + + return sDefaultContextAttribs; + } + + virtual EGLint getSurfaceWidth() { + return 64; + } + + virtual EGLint getSurfaceHeight() { + return 64; + } + + void loadShader(GLenum shaderType, const char* pSource, GLuint* outShader) { + GLuint shader = glCreateShader(shaderType); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); + if (shader) { + glShaderSource(shader, 1, &pSource, NULL); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); + glCompileShader(shader); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); + GLint compiled = 0; + glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); + if (!compiled) { + GLint infoLen = 0; + glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLen); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); + if (infoLen) { + char* buf = (char*) malloc(infoLen); + if (buf) { + glGetShaderInfoLog(shader, infoLen, NULL, buf); + printf("Shader compile log:\n%s\n", buf); + free(buf); + FAIL(); + } + } else { + char* buf = (char*) malloc(0x1000); + if (buf) { + glGetShaderInfoLog(shader, 0x1000, NULL, buf); + printf("Shader compile log:\n%s\n", buf); + free(buf); + FAIL(); + } + } + glDeleteShader(shader); + shader = 0; + } + } + ASSERT_TRUE(shader != 0); + *outShader = shader; + } + + void createProgram(const char* pVertexSource, const char* pFragmentSource, + GLuint* outPgm) { + GLuint vertexShader, fragmentShader; + { + SCOPED_TRACE("compiling vertex shader"); + loadShader(GL_VERTEX_SHADER, pVertexSource, &vertexShader); + if (HasFatalFailure()) { + return; + } + } + { + SCOPED_TRACE("compiling fragment shader"); + loadShader(GL_FRAGMENT_SHADER, pFragmentSource, &fragmentShader); + if (HasFatalFailure()) { + return; + } + } + + GLuint program = glCreateProgram(); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); + if (program) { + glAttachShader(program, vertexShader); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); + glAttachShader(program, fragmentShader); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); + glLinkProgram(program); + GLint linkStatus = GL_FALSE; + glGetProgramiv(program, GL_LINK_STATUS, &linkStatus); + if (linkStatus != GL_TRUE) { + GLint bufLength = 0; + glGetProgramiv(program, GL_INFO_LOG_LENGTH, &bufLength); + if (bufLength) { + char* buf = (char*) malloc(bufLength); + if (buf) { + glGetProgramInfoLog(program, bufLength, NULL, buf); + printf("Program link log:\n%s\n", buf); + free(buf); + FAIL(); + } + } + glDeleteProgram(program); + program = 0; + } + } + glDeleteShader(vertexShader); + glDeleteShader(fragmentShader); + ASSERT_TRUE(program != 0); + *outPgm = program; + } + + ::testing::AssertionResult checkPixel(int x, int y, int r, + int g, int b, int a) { + GLubyte pixel[4]; + String8 msg; + glReadPixels(x, y, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel); + GLenum err = glGetError(); + if (err != GL_NO_ERROR) { + msg += String8::format("error reading pixel: %#x", err); + while ((err = glGetError()) != GL_NO_ERROR) { + msg += String8::format(", %#x", err); + } + fprintf(stderr, "pixel check failure: %s\n", msg.string()); + return ::testing::AssertionFailure( + ::testing::Message(msg.string())); + } + if (r >= 0 && GLubyte(r) != pixel[0]) { + msg += String8::format("r(%d isn't %d)", pixel[0], r); + } + if (g >= 0 && GLubyte(g) != pixel[1]) { + if (!msg.isEmpty()) { + msg += " "; + } + msg += String8::format("g(%d isn't %d)", pixel[1], g); + } + if (b >= 0 && GLubyte(b) != pixel[2]) { + if (!msg.isEmpty()) { + msg += " "; + } + msg += String8::format("b(%d isn't %d)", pixel[2], b); + } + if (a >= 0 && GLubyte(a) != pixel[3]) { + if (!msg.isEmpty()) { + msg += " "; + } + msg += String8::format("a(%d isn't %d)", pixel[3], a); + } + if (!msg.isEmpty()) { + fprintf(stderr, "pixel check failure: %s\n", msg.string()); + return ::testing::AssertionFailure( + ::testing::Message(msg.string())); + } else { + return ::testing::AssertionSuccess(); + } + } + + int mDisplaySecs; + sp<SurfaceComposerClient> mComposerClient; + sp<SurfaceControl> mSurfaceControl; + + EGLDisplay mEglDisplay; + EGLSurface mEglSurface; + EGLContext mEglContext; +}; + +// XXX: Code above this point should live elsewhere + +class SurfaceTextureGLTest : public GLTest { +protected: + static const GLint TEX_ID = 123; + + virtual void SetUp() { + GLTest::SetUp(); + mST = new SurfaceTexture(TEX_ID); + mSTC = new SurfaceTextureClient(mST); + mANW = mSTC; + + const char vsrc[] = + "attribute vec4 vPosition;\n" + "varying vec2 texCoords;\n" + "uniform mat4 texMatrix;\n" + "void main() {\n" + " vec2 vTexCoords = 0.5 * (vPosition.xy + vec2(1.0, 1.0));\n" + " texCoords = (texMatrix * vec4(vTexCoords, 0.0, 1.0)).xy;\n" + " gl_Position = vPosition;\n" + "}\n"; + + const char fsrc[] = + "#extension GL_OES_EGL_image_external : require\n" + "precision mediump float;\n" + "uniform samplerExternalOES texSampler;\n" + "varying vec2 texCoords;\n" + "void main() {\n" + " gl_FragColor = texture2D(texSampler, texCoords);\n" + "}\n"; + + { + SCOPED_TRACE("creating shader program"); + createProgram(vsrc, fsrc, &mPgm); + if (HasFatalFailure()) { + return; + } + } + + mPositionHandle = glGetAttribLocation(mPgm, "vPosition"); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); + ASSERT_NE(-1, mPositionHandle); + mTexSamplerHandle = glGetUniformLocation(mPgm, "texSampler"); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); + ASSERT_NE(-1, mTexSamplerHandle); + mTexMatrixHandle = glGetUniformLocation(mPgm, "texMatrix"); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); + ASSERT_NE(-1, mTexMatrixHandle); + } + + // drawTexture draws the SurfaceTexture over the entire GL viewport. + void drawTexture() { + const GLfloat triangleVertices[] = { + -1.0f, 1.0f, + -1.0f, -1.0f, + 1.0f, -1.0f, + 1.0f, 1.0f, + }; + + glVertexAttribPointer(mPositionHandle, 2, GL_FLOAT, GL_FALSE, 0, triangleVertices); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); + glEnableVertexAttribArray(mPositionHandle); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); + + glUseProgram(mPgm); + glUniform1i(mTexSamplerHandle, 0); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); + glBindTexture(GL_TEXTURE_EXTERNAL_OES, TEX_ID); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); + + GLfloat texMatrix[16]; + mST->getTransformMatrix(texMatrix); + glUniformMatrix4fv(mTexMatrixHandle, 1, GL_FALSE, texMatrix); + + glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); + } + + sp<SurfaceTexture> mST; + sp<SurfaceTextureClient> mSTC; + sp<ANativeWindow> mANW; + + GLuint mPgm; + GLint mPositionHandle; + GLint mTexSamplerHandle; + GLint mTexMatrixHandle; +}; + +// Fill a YV12 buffer with a multi-colored checkerboard pattern +void fillYV12Buffer(uint8_t* buf, int w, int h, int stride) { + const int blockWidth = w > 16 ? w / 16 : 1; + const int blockHeight = h > 16 ? h / 16 : 1; + const int yuvTexOffsetY = 0; + int yuvTexStrideY = stride; + int yuvTexOffsetV = yuvTexStrideY * h; + int yuvTexStrideV = (yuvTexStrideY/2 + 0xf) & ~0xf; + int yuvTexOffsetU = yuvTexOffsetV + yuvTexStrideV * h/2; + int yuvTexStrideU = yuvTexStrideV; + for (int x = 0; x < w; x++) { + for (int y = 0; y < h; y++) { + int parityX = (x / blockWidth) & 1; + int parityY = (y / blockHeight) & 1; + unsigned char intensity = (parityX ^ parityY) ? 63 : 191; + buf[yuvTexOffsetY + (y * yuvTexStrideY) + x] = intensity; + if (x < w / 2 && y < h / 2) { + buf[yuvTexOffsetU + (y * yuvTexStrideU) + x] = intensity; + if (x * 2 < w / 2 && y * 2 < h / 2) { + buf[yuvTexOffsetV + (y*2 * yuvTexStrideV) + x*2 + 0] = + buf[yuvTexOffsetV + (y*2 * yuvTexStrideV) + x*2 + 1] = + buf[yuvTexOffsetV + ((y*2+1) * yuvTexStrideV) + x*2 + 0] = + buf[yuvTexOffsetV + ((y*2+1) * yuvTexStrideV) + x*2 + 1] = + intensity; + } + } + } + } +} + +// Fill a YV12 buffer with red outside a given rectangle and green inside it. +void fillYV12BufferRect(uint8_t* buf, int w, int h, int stride, + const android_native_rect_t& rect) { + const int yuvTexOffsetY = 0; + int yuvTexStrideY = stride; + int yuvTexOffsetV = yuvTexStrideY * h; + int yuvTexStrideV = (yuvTexStrideY/2 + 0xf) & ~0xf; + int yuvTexOffsetU = yuvTexOffsetV + yuvTexStrideV * h/2; + int yuvTexStrideU = yuvTexStrideV; + for (int x = 0; x < w; x++) { + for (int y = 0; y < h; y++) { + bool inside = rect.left <= x && x < rect.right && + rect.top <= y && y < rect.bottom; + buf[yuvTexOffsetY + (y * yuvTexStrideY) + x] = inside ? 240 : 64; + if (x < w / 2 && y < h / 2) { + bool inside = rect.left <= 2*x && 2*x < rect.right && + rect.top <= 2*y && 2*y < rect.bottom; + buf[yuvTexOffsetU + (y * yuvTexStrideU) + x] = 16; + buf[yuvTexOffsetV + (y * yuvTexStrideV) + x] = + inside ? 16 : 255; + } + } + } +} + +TEST_F(SurfaceTextureGLTest, TexturingFromCpuFilledYV12BufferNpot) { + const int yuvTexWidth = 64; + const int yuvTexHeight = 66; + + ASSERT_EQ(NO_ERROR, native_window_set_buffers_geometry(mANW.get(), + yuvTexWidth, yuvTexHeight, HAL_PIXEL_FORMAT_YV12)); + ASSERT_EQ(NO_ERROR, native_window_set_usage(mANW.get(), + GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN)); + + android_native_buffer_t* anb; + ASSERT_EQ(NO_ERROR, mANW->dequeueBuffer(mANW.get(), &anb)); + ASSERT_TRUE(anb != NULL); + + sp<GraphicBuffer> buf(new GraphicBuffer(anb, false)); + ASSERT_EQ(NO_ERROR, mANW->lockBuffer(mANW.get(), buf->getNativeBuffer())); + + // Fill the buffer with the a checkerboard pattern + uint8_t* img = NULL; + buf->lock(GRALLOC_USAGE_SW_WRITE_OFTEN, (void**)(&img)); + fillYV12Buffer(img, yuvTexWidth, yuvTexHeight, buf->getStride()); + buf->unlock(); + ASSERT_EQ(NO_ERROR, mANW->queueBuffer(mANW.get(), buf->getNativeBuffer())); + + mST->updateTexImage(); + + glClearColor(0.2, 0.2, 0.2, 0.2); + glClear(GL_COLOR_BUFFER_BIT); + + drawTexture(); + + EXPECT_TRUE(checkPixel( 0, 0, 255, 127, 255, 255)); + EXPECT_TRUE(checkPixel(63, 0, 0, 133, 0, 255)); + EXPECT_TRUE(checkPixel(63, 63, 0, 133, 0, 255)); + EXPECT_TRUE(checkPixel( 0, 63, 255, 127, 255, 255)); + + EXPECT_TRUE(checkPixel(22, 44, 247, 70, 255, 255)); + EXPECT_TRUE(checkPixel(45, 52, 209, 32, 235, 255)); + EXPECT_TRUE(checkPixel(52, 51, 100, 255, 73, 255)); + EXPECT_TRUE(checkPixel( 7, 31, 155, 0, 118, 255)); + EXPECT_TRUE(checkPixel(31, 9, 148, 71, 110, 255)); + EXPECT_TRUE(checkPixel(29, 35, 255, 127, 255, 255)); + EXPECT_TRUE(checkPixel(36, 22, 155, 29, 0, 255)); +} + +// XXX: This test is disabled because it it currently broken on all devices to +// which I have access. Some of the checkPixel calls are not correct because +// I just copied them from the npot test above and haven't bothered to figure +// out the correct values. +TEST_F(SurfaceTextureGLTest, DISABLED_TexturingFromCpuFilledYV12BufferPow2) { + const int yuvTexWidth = 64; + const int yuvTexHeight = 64; + + ASSERT_EQ(NO_ERROR, native_window_set_buffers_geometry(mANW.get(), + yuvTexWidth, yuvTexHeight, HAL_PIXEL_FORMAT_YV12)); + ASSERT_EQ(NO_ERROR, native_window_set_usage(mANW.get(), + GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN)); + + android_native_buffer_t* anb; + ASSERT_EQ(NO_ERROR, mANW->dequeueBuffer(mANW.get(), &anb)); + ASSERT_TRUE(anb != NULL); + + sp<GraphicBuffer> buf(new GraphicBuffer(anb, false)); + ASSERT_EQ(NO_ERROR, mANW->lockBuffer(mANW.get(), buf->getNativeBuffer())); + + // Fill the buffer with the a checkerboard pattern + uint8_t* img = NULL; + buf->lock(GRALLOC_USAGE_SW_WRITE_OFTEN, (void**)(&img)); + fillYV12Buffer(img, yuvTexWidth, yuvTexHeight, buf->getStride()); + buf->unlock(); + ASSERT_EQ(NO_ERROR, mANW->queueBuffer(mANW.get(), buf->getNativeBuffer())); + + mST->updateTexImage(); + + glClearColor(0.2, 0.2, 0.2, 0.2); + glClear(GL_COLOR_BUFFER_BIT); + + drawTexture(); + + EXPECT_TRUE(checkPixel( 0, 0, 255, 127, 255, 255)); + EXPECT_TRUE(checkPixel(63, 0, 0, 133, 0, 255)); + EXPECT_TRUE(checkPixel(63, 63, 0, 133, 0, 255)); + EXPECT_TRUE(checkPixel( 0, 63, 255, 127, 255, 255)); + + EXPECT_TRUE(checkPixel(22, 19, 247, 70, 255, 255)); + EXPECT_TRUE(checkPixel(45, 11, 209, 32, 235, 255)); + EXPECT_TRUE(checkPixel(52, 12, 100, 255, 73, 255)); + EXPECT_TRUE(checkPixel( 7, 32, 155, 0, 118, 255)); + EXPECT_TRUE(checkPixel(31, 54, 148, 71, 110, 255)); + EXPECT_TRUE(checkPixel(29, 28, 255, 127, 255, 255)); + EXPECT_TRUE(checkPixel(36, 41, 155, 29, 0, 255)); +} + +TEST_F(SurfaceTextureGLTest, TexturingFromCpuFilledYV12BufferWithCrop) { + const int yuvTexWidth = 64; + const int yuvTexHeight = 66; + + ASSERT_EQ(NO_ERROR, native_window_set_buffers_geometry(mANW.get(), + yuvTexWidth, yuvTexHeight, HAL_PIXEL_FORMAT_YV12)); + ASSERT_EQ(NO_ERROR, native_window_set_usage(mANW.get(), + GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN)); + + android_native_rect_t crops[] = { + {4, 6, 22, 36}, + {0, 6, 22, 36}, + {4, 0, 22, 36}, + {4, 6, yuvTexWidth, 36}, + {4, 6, 22, yuvTexHeight}, + }; + + for (int i = 0; i < 5; i++) { + const android_native_rect_t& crop(crops[i]); + SCOPED_TRACE(String8::format("rect{ l: %d t: %d r: %d b: %d }", crop.left, + crop.top, crop.right, crop.bottom).string()); + + ASSERT_EQ(NO_ERROR, native_window_set_crop(mANW.get(), &crop)); + + android_native_buffer_t* anb; + ASSERT_EQ(NO_ERROR, mANW->dequeueBuffer(mANW.get(), &anb)); + ASSERT_TRUE(anb != NULL); + + sp<GraphicBuffer> buf(new GraphicBuffer(anb, false)); + ASSERT_EQ(NO_ERROR, mANW->lockBuffer(mANW.get(), buf->getNativeBuffer())); + + uint8_t* img = NULL; + buf->lock(GRALLOC_USAGE_SW_WRITE_OFTEN, (void**)(&img)); + fillYV12BufferRect(img, yuvTexWidth, yuvTexHeight, buf->getStride(), crop); + buf->unlock(); + ASSERT_EQ(NO_ERROR, mANW->queueBuffer(mANW.get(), buf->getNativeBuffer())); + + mST->updateTexImage(); + + glClearColor(0.2, 0.2, 0.2, 0.2); + glClear(GL_COLOR_BUFFER_BIT); + + drawTexture(); + + EXPECT_TRUE(checkPixel( 0, 0, 82, 255, 35, 255)); + EXPECT_TRUE(checkPixel(63, 0, 82, 255, 35, 255)); + EXPECT_TRUE(checkPixel(63, 63, 82, 255, 35, 255)); + EXPECT_TRUE(checkPixel( 0, 63, 82, 255, 35, 255)); + + EXPECT_TRUE(checkPixel(25, 14, 82, 255, 35, 255)); + EXPECT_TRUE(checkPixel(35, 31, 82, 255, 35, 255)); + EXPECT_TRUE(checkPixel(57, 6, 82, 255, 35, 255)); + EXPECT_TRUE(checkPixel( 5, 42, 82, 255, 35, 255)); + EXPECT_TRUE(checkPixel(32, 33, 82, 255, 35, 255)); + EXPECT_TRUE(checkPixel(16, 26, 82, 255, 35, 255)); + EXPECT_TRUE(checkPixel(46, 51, 82, 255, 35, 255)); + } +} + +} diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk index f4a0161..b465fee 100644 --- a/libs/hwui/Android.mk +++ b/libs/hwui/Android.mk @@ -42,7 +42,6 @@ ifeq ($(USE_OPENGL_RENDERER),true) LOCAL_SHARED_LIBRARIES := libcutils libutils libGLESv2 libskia libui LOCAL_MODULE := libhwui LOCAL_MODULE_TAGS := optional - LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) diff --git a/libs/hwui/DisplayListRenderer.cpp b/libs/hwui/DisplayListRenderer.cpp index 737fa02..868290b 100644 --- a/libs/hwui/DisplayListRenderer.cpp +++ b/libs/hwui/DisplayListRenderer.cpp @@ -285,9 +285,12 @@ bool DisplayList::replay(OpenGLRenderer& renderer, Rect& dirty, uint32_t level) break; case DrawDisplayList: { DisplayList* displayList = getDisplayList(); - DISPLAY_LIST_LOGD("%s%s %p, %d", (char*) indent, OP_NAMES[op], - displayList, level + 1); - needsInvalidate |= renderer.drawDisplayList(displayList, dirty, level + 1); + uint32_t width = getUInt(); + uint32_t height = getUInt(); + DISPLAY_LIST_LOGD("%s%s %p, %dx%d, %d", (char*) indent, OP_NAMES[op], + displayList, width, height, level + 1); + needsInvalidate |= renderer.drawDisplayList(displayList, width, height, + dirty, level + 1); } break; case DrawLayer: { @@ -674,11 +677,13 @@ bool DisplayListRenderer::clipRect(float left, float top, float right, float bot return OpenGLRenderer::clipRect(left, top, right, bottom, op); } -bool DisplayListRenderer::drawDisplayList(DisplayList* displayList, Rect& dirty, uint32_t level) { +bool DisplayListRenderer::drawDisplayList(DisplayList* displayList, + uint32_t width, uint32_t height, Rect& dirty, uint32_t level) { // dirty is an out parameter and should not be recorded, // it matters only when replaying the display list addOp(DisplayList::DrawDisplayList); addDisplayList(displayList); + addSize(width, height); return false; } diff --git a/libs/hwui/DisplayListRenderer.h b/libs/hwui/DisplayListRenderer.h index f24545d..6fc315c 100644 --- a/libs/hwui/DisplayListRenderer.h +++ b/libs/hwui/DisplayListRenderer.h @@ -144,6 +144,10 @@ private: return mReader.readInt(); } + inline uint32_t getUInt() { + return mReader.readU32(); + } + SkMatrix* getMatrix() { return (SkMatrix*) getInt(); } @@ -238,7 +242,8 @@ public: bool clipRect(float left, float top, float right, float bottom, SkRegion::Op op); - bool drawDisplayList(DisplayList* displayList, Rect& dirty, uint32_t level = 0); + bool drawDisplayList(DisplayList* displayList, uint32_t width, uint32_t height, + Rect& dirty, uint32_t level = 0); void drawLayer(Layer* layer, float x, float y, SkPaint* paint); void drawBitmap(SkBitmap* bitmap, float left, float top, SkPaint* paint); void drawBitmap(SkBitmap* bitmap, SkMatrix* matrix, SkPaint* paint); @@ -323,6 +328,11 @@ private: mWriter.writeInt(value); } + inline void addSize(uint32_t w, uint32_t h) { + mWriter.writeInt(w); + mWriter.writeInt(h); + } + void addInts(const int32_t* values, uint32_t count) { mWriter.writeInt(count); for (uint32_t i = 0; i < count; i++) { diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 1f65201..b8bd7d6 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -403,22 +403,23 @@ bool OpenGLRenderer::createLayer(sp<Snapshot> snapshot, float left, float top, // Window coordinates of the layer Rect bounds(left, top, right, bottom); - if (fboLayer) { - // Clear the previous layer regions before we change the viewport - clearLayerRegions(); - } else { + if (!fboLayer) { mSnapshot->transform->mapRect(bounds); // Layers only make sense if they are in the framebuffer's bounds - bounds.intersect(*snapshot->clipRect); - - // 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 - bounds.intersect(snapshot->previous->viewport); + if (bounds.intersect(*snapshot->clipRect)) { + // 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 + if (!bounds.intersect(snapshot->previous->viewport)) { + bounds.setEmpty(); + } + } else { + bounds.setEmpty(); + } } if (bounds.isEmpty() || bounds.getWidth() > mCaches.maxTextureSize || @@ -464,8 +465,14 @@ bool OpenGLRenderer::createLayer(sp<Snapshot> snapshot, float left, float top, glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, bounds.left, snapshot->height - bounds.bottom, bounds.getWidth(), bounds.getHeight()); } - // Enqueue the buffer coordinates to clear the corresponding region later - mLayers.push(new Rect(bounds)); + + // Clear the framebuffer where the layer will draw + glScissor(bounds.left, mSnapshot->height - bounds.bottom, + bounds.getWidth(), bounds.getHeight()); + glClearColor(0.0f, 0.0f, 0.0f, 0.0f); + glClear(GL_COLOR_BUFFER_BIT); + + dirtyClip(); } } @@ -760,31 +767,6 @@ void OpenGLRenderer::dirtyLayerUnchecked(Rect& bounds, Region* region) { #endif } -void OpenGLRenderer::clearLayerRegions() { - if (mLayers.size() == 0 || mSnapshot->isIgnored()) return; - - Rect clipRect(*mSnapshot->clipRect); - clipRect.snapToPixelBoundaries(); - - for (uint32_t i = 0; i < mLayers.size(); i++) { - Rect* bounds = mLayers.itemAt(i); - if (clipRect.intersects(*bounds)) { - // Clear the framebuffer where the layer will draw - glScissor(bounds->left, mSnapshot->height - bounds->bottom, - bounds->getWidth(), bounds->getHeight()); - glClearColor(0.0f, 0.0f, 0.0f, 0.0f); - glClear(GL_COLOR_BUFFER_BIT); - - // Restore the clip - dirtyClip(); - } - - delete bounds; - } - - mLayers.clear(); -} - /////////////////////////////////////////////////////////////////////////////// // Transforms /////////////////////////////////////////////////////////////////////////////// @@ -870,7 +852,6 @@ bool OpenGLRenderer::clipRect(float left, float top, float right, float bottom, /////////////////////////////////////////////////////////////////////////////// void OpenGLRenderer::setupDraw() { - clearLayerRegions(); if (mDirtyClip) { setScissorFromClip(); } @@ -1064,12 +1045,18 @@ void OpenGLRenderer::finishDrawTexture() { // Drawing /////////////////////////////////////////////////////////////////////////////// -bool OpenGLRenderer::drawDisplayList(DisplayList* displayList, Rect& dirty, uint32_t level) { +bool OpenGLRenderer::drawDisplayList(DisplayList* displayList, uint32_t width, uint32_t height, + Rect& dirty, uint32_t level) { + if (quickReject(0.0f, 0.0f, width, height)) { + return false; + } + // All the usual checks and setup operations (quickReject, setupDraw, etc.) // will be performed by the display list itself if (displayList) { return displayList->replay(*this, dirty, level); } + return false; } diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h index 9d86388..7362473 100644 --- a/libs/hwui/OpenGLRenderer.h +++ b/libs/hwui/OpenGLRenderer.h @@ -96,7 +96,8 @@ public: bool quickReject(float left, float top, float right, float bottom); virtual bool clipRect(float left, float top, float right, float bottom, SkRegion::Op op); - virtual bool drawDisplayList(DisplayList* displayList, Rect& dirty, uint32_t level = 0); + virtual bool drawDisplayList(DisplayList* displayList, uint32_t width, uint32_t height, + Rect& dirty, uint32_t level = 0); virtual void drawLayer(Layer* layer, float x, float y, SkPaint* paint); virtual void drawBitmap(SkBitmap* bitmap, float left, float top, SkPaint* paint); virtual void drawBitmap(SkBitmap* bitmap, SkMatrix* matrix, SkPaint* paint); @@ -247,12 +248,6 @@ private: void composeLayerRect(Layer* layer, const Rect& rect, bool swap = false); /** - * 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. */ @@ -499,9 +494,6 @@ private: // Various caches Caches& mCaches; - // List of rectangles to clear due to calls to saveLayer() - Vector<Rect*> mLayers; - // Indentity matrix const mat4 mIdentity; diff --git a/libs/hwui/ProgramCache.h b/libs/hwui/ProgramCache.h index 3acd18a..ead5b92 100644 --- a/libs/hwui/ProgramCache.h +++ b/libs/hwui/ProgramCache.h @@ -231,9 +231,11 @@ struct ProgramDescription { * Logs the specified message followed by the key identifying this program. */ void log(const char* message) const { +#if DEBUG_PROGRAMS programid k = key(); PROGRAM_LOGD("%s (key = 0x%.8x%.8x)", message, uint32_t(k >> 32), uint32_t(k & 0xffffffff)); +#endif } private: diff --git a/libs/rs/Android.mk b/libs/rs/Android.mk index 0836887..5520315 100644 --- a/libs/rs/Android.mk +++ b/libs/rs/Android.mk @@ -28,7 +28,6 @@ RSG_GENERATOR:=$(LOCAL_BUILT_MODULE) # slangdata_output_var_name := rs_runtime_lib_bc # LOCAL_MODULE := librslib_rt -# LOCAL_PRELINK_MODULE := false # LOCAL_MODULE_CLASS := STATIC_LIBRARIES # LOCAL_MODULE_TAGS := optional diff --git a/libs/rs/rsScriptC_Lib.cpp b/libs/rs/rsScriptC_Lib.cpp index 7c64184..23230a6 100644 --- a/libs/rs/rsScriptC_Lib.cpp +++ b/libs/rs/rsScriptC_Lib.cpp @@ -961,43 +961,43 @@ static ScriptCState::SymbolTable_t gSyms[] = { { "_Z22rsSendToClientBlockingiPKvj", (void *)&SC_toClientBlocking2, false }, // matrix - { "_Z20rsMatrixLoadIdentityP12rs_matrix4x4", (void *)&SC_MatrixLoadIdentity_4x4, false }, - { "_Z20rsMatrixLoadIdentityP12rs_matrix3x3", (void *)&SC_MatrixLoadIdentity_3x3, false }, - { "_Z20rsMatrixLoadIdentityP12rs_matrix2x2", (void *)&SC_MatrixLoadIdentity_2x2, false }, - - { "_Z12rsMatrixLoadP12rs_matrix4x4PKf", (void *)&SC_MatrixLoad_4x4_f, false }, - { "_Z12rsMatrixLoadP12rs_matrix3x3PKf", (void *)&SC_MatrixLoad_3x3_f, false }, - { "_Z12rsMatrixLoadP12rs_matrix2x2PKf", (void *)&SC_MatrixLoad_2x2_f, false }, - - { "_Z12rsMatrixLoadP12rs_matrix4x4PKS_", (void *)&SC_MatrixLoad_4x4_4x4, false }, - { "_Z12rsMatrixLoadP12rs_matrix4x4PK12rs_matrix3x3", (void *)&SC_MatrixLoad_4x4_3x3, false }, - { "_Z12rsMatrixLoadP12rs_matrix4x4PK12rs_matrix2x2", (void *)&SC_MatrixLoad_4x4_2x2, false }, - { "_Z12rsMatrixLoadP12rs_matrix3x3PKS_", (void *)&SC_MatrixLoad_3x3_3x3, false }, - { "_Z12rsMatrixLoadP12rs_matrix2x2PKS_", (void *)&SC_MatrixLoad_2x2_2x2, false }, - - { "_Z18rsMatrixLoadRotateP12rs_matrix4x4ffff", (void *)&SC_MatrixLoadRotate, false }, - { "_Z17rsMatrixLoadScaleP12rs_matrix4x4fff", (void *)&SC_MatrixLoadScale, false }, - { "_Z21rsMatrixLoadTranslateP12rs_matrix4x4fff", (void *)&SC_MatrixLoadTranslate, false }, - { "_Z14rsMatrixRotateP12rs_matrix4x4ffff", (void *)&SC_MatrixRotate, false }, - { "_Z13rsMatrixScaleP12rs_matrix4x4fff", (void *)&SC_MatrixScale, false }, - { "_Z17rsMatrixTranslateP12rs_matrix4x4fff", (void *)&SC_MatrixTranslate, false }, - - { "_Z20rsMatrixLoadMultiplyP12rs_matrix4x4PKS_S2_", (void *)&SC_MatrixLoadMultiply_4x4_4x4_4x4, false }, - { "_Z16rsMatrixMultiplyP12rs_matrix4x4PKS_", (void *)&SC_MatrixMultiply_4x4_4x4, false }, - { "_Z20rsMatrixLoadMultiplyP12rs_matrix3x3PKS_S2_", (void *)&SC_MatrixLoadMultiply_3x3_3x3_3x3, false }, - { "_Z16rsMatrixMultiplyP12rs_matrix3x3PKS_", (void *)&SC_MatrixMultiply_3x3_3x3, false }, - { "_Z20rsMatrixLoadMultiplyP12rs_matrix2x2PKS_S2_", (void *)&SC_MatrixLoadMultiply_2x2_2x2_2x2, false }, - { "_Z16rsMatrixMultiplyP12rs_matrix2x2PKS_", (void *)&SC_MatrixMultiply_2x2_2x2, false }, - - { "_Z17rsMatrixLoadOrthoP12rs_matrix4x4ffffff", (void *)&SC_MatrixLoadOrtho, false }, - { "_Z19rsMatrixLoadFrustumP12rs_matrix4x4ffffff", (void *)&SC_MatrixLoadFrustum, false }, - { "_Z23rsMatrixLoadPerspectiveP12rs_matrix4x4ffff", (void *)&SC_MatrixLoadPerspective, false }, - - { "_Z15rsMatrixInverseP12rs_matrix4x4", (void *)&SC_MatrixInverse_4x4, false }, - { "_Z24rsMatrixInverseTransposeP12rs_matrix4x4", (void *)&SC_MatrixInverseTranspose_4x4, false }, - { "_Z17rsMatrixTransposeP12rs_matrix4x4", (void *)&SC_MatrixTranspose_4x4, false }, - { "_Z17rsMatrixTransposeP12rs_matrix4x4", (void *)&SC_MatrixTranspose_3x3, false }, - { "_Z17rsMatrixTransposeP12rs_matrix4x4", (void *)&SC_MatrixTranspose_2x2, false }, + { "_Z20rsMatrixLoadIdentityP12rs_matrix4x4", (void *)&SC_MatrixLoadIdentity_4x4, true }, + { "_Z20rsMatrixLoadIdentityP12rs_matrix3x3", (void *)&SC_MatrixLoadIdentity_3x3, true }, + { "_Z20rsMatrixLoadIdentityP12rs_matrix2x2", (void *)&SC_MatrixLoadIdentity_2x2, true }, + + { "_Z12rsMatrixLoadP12rs_matrix4x4PKf", (void *)&SC_MatrixLoad_4x4_f, true }, + { "_Z12rsMatrixLoadP12rs_matrix3x3PKf", (void *)&SC_MatrixLoad_3x3_f, true }, + { "_Z12rsMatrixLoadP12rs_matrix2x2PKf", (void *)&SC_MatrixLoad_2x2_f, true }, + + { "_Z12rsMatrixLoadP12rs_matrix4x4PKS_", (void *)&SC_MatrixLoad_4x4_4x4, true }, + { "_Z12rsMatrixLoadP12rs_matrix4x4PK12rs_matrix3x3", (void *)&SC_MatrixLoad_4x4_3x3, true }, + { "_Z12rsMatrixLoadP12rs_matrix4x4PK12rs_matrix2x2", (void *)&SC_MatrixLoad_4x4_2x2, true }, + { "_Z12rsMatrixLoadP12rs_matrix3x3PKS_", (void *)&SC_MatrixLoad_3x3_3x3, true }, + { "_Z12rsMatrixLoadP12rs_matrix2x2PKS_", (void *)&SC_MatrixLoad_2x2_2x2, true }, + + { "_Z18rsMatrixLoadRotateP12rs_matrix4x4ffff", (void *)&SC_MatrixLoadRotate, true }, + { "_Z17rsMatrixLoadScaleP12rs_matrix4x4fff", (void *)&SC_MatrixLoadScale, true }, + { "_Z21rsMatrixLoadTranslateP12rs_matrix4x4fff", (void *)&SC_MatrixLoadTranslate, true }, + { "_Z14rsMatrixRotateP12rs_matrix4x4ffff", (void *)&SC_MatrixRotate, true }, + { "_Z13rsMatrixScaleP12rs_matrix4x4fff", (void *)&SC_MatrixScale, true }, + { "_Z17rsMatrixTranslateP12rs_matrix4x4fff", (void *)&SC_MatrixTranslate, true }, + + { "_Z20rsMatrixLoadMultiplyP12rs_matrix4x4PKS_S2_", (void *)&SC_MatrixLoadMultiply_4x4_4x4_4x4, true }, + { "_Z16rsMatrixMultiplyP12rs_matrix4x4PKS_", (void *)&SC_MatrixMultiply_4x4_4x4, true }, + { "_Z20rsMatrixLoadMultiplyP12rs_matrix3x3PKS_S2_", (void *)&SC_MatrixLoadMultiply_3x3_3x3_3x3, true }, + { "_Z16rsMatrixMultiplyP12rs_matrix3x3PKS_", (void *)&SC_MatrixMultiply_3x3_3x3, true }, + { "_Z20rsMatrixLoadMultiplyP12rs_matrix2x2PKS_S2_", (void *)&SC_MatrixLoadMultiply_2x2_2x2_2x2, true }, + { "_Z16rsMatrixMultiplyP12rs_matrix2x2PKS_", (void *)&SC_MatrixMultiply_2x2_2x2, true }, + + { "_Z17rsMatrixLoadOrthoP12rs_matrix4x4ffffff", (void *)&SC_MatrixLoadOrtho, true }, + { "_Z19rsMatrixLoadFrustumP12rs_matrix4x4ffffff", (void *)&SC_MatrixLoadFrustum, true }, + { "_Z23rsMatrixLoadPerspectiveP12rs_matrix4x4ffff", (void *)&SC_MatrixLoadPerspective, true }, + + { "_Z15rsMatrixInverseP12rs_matrix4x4", (void *)&SC_MatrixInverse_4x4, true }, + { "_Z24rsMatrixInverseTransposeP12rs_matrix4x4", (void *)&SC_MatrixInverseTranspose_4x4, true }, + { "_Z17rsMatrixTransposeP12rs_matrix4x4", (void *)&SC_MatrixTranspose_4x4, true }, + { "_Z17rsMatrixTransposeP12rs_matrix4x4", (void *)&SC_MatrixTranspose_3x3, true }, + { "_Z17rsMatrixTransposeP12rs_matrix4x4", (void *)&SC_MatrixTranspose_2x2, true }, { "_Z9rsForEach9rs_script13rs_allocationS0_PKv", (void *)&SC_ForEach, false }, //{ "_Z9rsForEach9rs_script13rs_allocationS0_PKv", (void *)&SC_ForEach2, true }, diff --git a/libs/surfaceflinger_client/Surface.cpp b/libs/surfaceflinger_client/Surface.cpp index afabbf4..21d509a 100644 --- a/libs/surfaceflinger_client/Surface.cpp +++ b/libs/surfaceflinger_client/Surface.cpp @@ -712,11 +712,15 @@ int Surface::query(int what, int* value) case NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS: *value = MIN_UNDEQUEUED_BUFFERS; return NO_ERROR; - case NATIVE_WINDOW_QUEUES_TO_WINDOW_COMPOSER: + case NATIVE_WINDOW_QUEUES_TO_WINDOW_COMPOSER: { sp<ISurfaceComposer> sf(ComposerService::getComposerService()); *value = sf->authenticateSurface(mSurface) ? 1 : 0; return NO_ERROR; } + case NATIVE_WINDOW_CONCRETE_TYPE: + *value = NATIVE_WINDOW_SURFACE; + return NO_ERROR; + } return BAD_VALUE; } diff --git a/libs/surfaceflinger_client/tests/Surface_test.cpp b/libs/surfaceflinger_client/tests/Surface_test.cpp index 74ebf4e..fd07479 100644 --- a/libs/surfaceflinger_client/tests/Surface_test.cpp +++ b/libs/surfaceflinger_client/tests/Surface_test.cpp @@ -130,4 +130,12 @@ TEST_F(SurfaceTest, ScreenshotsOfProtectedBuffersFail) { ASSERT_TRUE(heap != NULL); } +TEST_F(SurfaceTest, ConcreteTypeIsSurface) { + sp<ANativeWindow> anw(mSurface); + int result = -123; + int err = anw->query(anw.get(), NATIVE_WINDOW_CONCRETE_TYPE, &result); + EXPECT_EQ(NO_ERROR, err); + EXPECT_EQ(NATIVE_WINDOW_SURFACE, result); +} + } diff --git a/libs/ui/FramebufferNativeWindow.cpp b/libs/ui/FramebufferNativeWindow.cpp index 0702d49..dc223f9 100644 --- a/libs/ui/FramebufferNativeWindow.cpp +++ b/libs/ui/FramebufferNativeWindow.cpp @@ -286,6 +286,9 @@ int FramebufferNativeWindow::query(ANativeWindow* window, case NATIVE_WINDOW_FORMAT: *value = fb->format; return NO_ERROR; + case NATIVE_WINDOW_CONCRETE_TYPE: + *value = NATIVE_WINDOW_FRAMEBUFFER; + return NO_ERROR; } *value = 0; return BAD_VALUE; diff --git a/libs/usb/src/com/android/future/usb/UsbAccessory.java b/libs/usb/src/com/android/future/usb/UsbAccessory.java index 3d0707f..0f965d7 100644 --- a/libs/usb/src/com/android/future/usb/UsbAccessory.java +++ b/libs/usb/src/com/android/future/usb/UsbAccessory.java @@ -19,13 +19,14 @@ package com.android.future.usb; /** * A class representing a USB accessory. */ -public final class UsbAccessory { +public class UsbAccessory { private final String mManufacturer; private final String mModel; private final String mDescription; private final String mVersion; private final String mUri; + private final String mSerial; /* package */ UsbAccessory(android.hardware.usb.UsbAccessory accessory) { mManufacturer = accessory.getManufacturer(); @@ -33,6 +34,7 @@ public final class UsbAccessory { mDescription = accessory.getDescription(); mVersion = accessory.getVersion(); mUri = accessory.getUri(); + mSerial = accessory.getSerial(); } /** @@ -82,6 +84,17 @@ public final class UsbAccessory { return mUri; } + /** + * Returns the unique serial number for the accessory. + * This is an optional serial number that can be used to differentiate + * between individual accessories of the same model and manufacturer + * + * @return the unique serial number + */ + public String getSerial() { + return mSerial; + } + private static boolean compare(String s1, String s2) { if (s1 == null) return (s2 == null); return s1.equals(s2); @@ -95,7 +108,8 @@ public final class UsbAccessory { compare(mModel, accessory.getModel()) && compare(mDescription, accessory.getDescription()) && compare(mVersion, accessory.getVersion()) && - compare(mUri, accessory.getUri())); + compare(mUri, accessory.getUri()) && + compare(mSerial, accessory.getSerial())); } return false; } @@ -106,7 +120,8 @@ public final class UsbAccessory { (mModel == null ? 0 : mModel.hashCode()) ^ (mDescription == null ? 0 : mDescription.hashCode()) ^ (mVersion == null ? 0 : mVersion.hashCode()) ^ - (mUri == null ? 0 : mUri.hashCode())); + (mUri == null ? 0 : mUri.hashCode()) ^ + (mSerial == null ? 0 : mSerial.hashCode())); } @Override @@ -115,6 +130,7 @@ public final class UsbAccessory { ", mModel=" + mModel + ", mDescription=" + mDescription + ", mVersion=" + mVersion + - ", mUri=" + mUri + "]"; + ", mUri=" + mUri + + ", mSerial=" + mSerial + "]"; } } diff --git a/libs/usb/src/com/android/future/usb/UsbManager.java b/libs/usb/src/com/android/future/usb/UsbManager.java index 840e1e3..d424b63 100644 --- a/libs/usb/src/com/android/future/usb/UsbManager.java +++ b/libs/usb/src/com/android/future/usb/UsbManager.java @@ -130,7 +130,8 @@ public class UsbManager { try { return mService.openAccessory(new android.hardware.usb.UsbAccessory( accessory.getManufacturer(),accessory.getModel(), - accessory.getDescription(), accessory.getVersion(), accessory.getUri())); + accessory.getDescription(), accessory.getVersion(), + accessory.getUri(), accessory.getSerial())); } catch (RemoteException e) { Log.e(TAG, "RemoteException in openAccessory" , e); return null; @@ -150,7 +151,8 @@ public class UsbManager { try { return mService.hasAccessoryPermission(new android.hardware.usb.UsbAccessory( accessory.getManufacturer(),accessory.getModel(), - accessory.getDescription(), accessory.getVersion(), accessory.getUri())); + accessory.getDescription(), accessory.getVersion(), + accessory.getUri(), accessory.getSerial())); } catch (RemoteException e) { Log.e(TAG, "RemoteException in hasPermission", e); return false; @@ -174,7 +176,8 @@ public class UsbManager { try { mService.requestAccessoryPermission(new android.hardware.usb.UsbAccessory( accessory.getManufacturer(),accessory.getModel(), - accessory.getDescription(), accessory.getVersion(), accessory.getUri()), + accessory.getDescription(), accessory.getVersion(), + accessory.getUri(), accessory.getSerial()), mContext.getPackageName(), pi); } catch (RemoteException e) { Log.e(TAG, "RemoteException in requestPermission", e); diff --git a/libs/usb/tests/AccessoryChat/Android.mk b/libs/usb/tests/AccessoryChat/Android.mk index d555961..77b8424 100644 --- a/libs/usb/tests/AccessoryChat/Android.mk +++ b/libs/usb/tests/AccessoryChat/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_PACKAGE_NAME := AccessoryChatGB +LOCAL_PACKAGE_NAME := AccessoryChat LOCAL_JAVA_LIBRARIES := com.android.future.usb.accessory diff --git a/libs/usb/tests/AccessoryChat/AndroidManifest.xml b/libs/usb/tests/AccessoryChat/AndroidManifest.xml index d6093ae..802b715 100644 --- a/libs/usb/tests/AccessoryChat/AndroidManifest.xml +++ b/libs/usb/tests/AccessoryChat/AndroidManifest.xml @@ -17,10 +17,10 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.accessorychat"> - <application> + <application android:label="Accessory Chat"> <uses-library android:name="com.android.future.usb.accessory" /> - <activity android:name="AccessoryChat" android:label="Accessory Chat GB"> + <activity android:name="AccessoryChat" android:label="Accessory Chat"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> diff --git a/libs/usb/tests/AccessoryChat/accessorychat/accessorychat.c b/libs/usb/tests/AccessoryChat/accessorychat/accessorychat.c index 3c0de69..85b52dd 100644 --- a/libs/usb/tests/AccessoryChat/accessorychat/accessorychat.c +++ b/libs/usb/tests/AccessoryChat/accessorychat/accessorychat.c @@ -24,6 +24,7 @@ #include <fcntl.h> #include <errno.h> #include <pthread.h> +#include <time.h> #include <usbhost/usbhost.h> #include <linux/usb/f_accessory.h> @@ -65,9 +66,20 @@ static void* write_thread(void* arg) { return NULL; } +static void milli_sleep(int millis) { + struct timespec tm; + + tm.tv_sec = 0; + tm.tv_nsec = millis * 1000000; + nanosleep(&tm, NULL); +} + static void send_string(struct usb_device *device, int index, const char* string) { int ret = usb_device_control_transfer(device, USB_DIR_OUT | USB_TYPE_VENDOR, ACCESSORY_SEND_STRING, 0, index, (void *)string, strlen(string) + 1, 0); + + // some devices can't handle back-to-back requests, so delay a bit + milli_sleep(10); } static int usb_device_added(const char *devname, void* client_data) { @@ -143,9 +155,10 @@ static int usb_device_added(const char *devname, void* client_data) { send_string(device, ACCESSORY_STRING_MANUFACTURER, "Google, Inc."); send_string(device, ACCESSORY_STRING_MODEL, "AccessoryChat"); - send_string(device, ACCESSORY_STRING_DESCRIPTION, "Sample Program"); + send_string(device, ACCESSORY_STRING_DESCRIPTION, "Accessory Chat"); send_string(device, ACCESSORY_STRING_VERSION, "1.0"); send_string(device, ACCESSORY_STRING_URI, "http://www.android.com"); + send_string(device, ACCESSORY_STRING_SERIAL, "1234567890"); ret = usb_device_control_transfer(device, USB_DIR_OUT | USB_TYPE_VENDOR, ACCESSORY_START, 0, 0, 0, 0, 0); diff --git a/libs/usb/tests/AccessoryChat/src/com/android/accessorychat/AccessoryChat.java b/libs/usb/tests/AccessoryChat/src/com/android/accessorychat/AccessoryChat.java index f9a5bf4..c3f4fa3 100644 --- a/libs/usb/tests/AccessoryChat/src/com/android/accessorychat/AccessoryChat.java +++ b/libs/usb/tests/AccessoryChat/src/com/android/accessorychat/AccessoryChat.java @@ -135,7 +135,8 @@ public class AccessoryChat extends Activity implements Runnable, TextView.OnEdit } private void openAccessory(UsbAccessory accessory) { - mFileDescriptor = mUsbManager.openAccessory(accessory); + Log.d(TAG, "openAccessory: " + accessory); + mFileDescriptor = mUsbManager.openAccessory(accessory); if (mFileDescriptor != null) { FileDescriptor fd = mFileDescriptor.getFileDescriptor(); mInputStream = new FileInputStream(fd); diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java index 74d65d1..6b9f2fb 100644 --- a/media/java/android/media/MediaScanner.java +++ b/media/java/android/media/MediaScanner.java @@ -1585,6 +1585,17 @@ public class MediaScanner private static native final void native_init(); private native final void native_setup(); private native final void native_finalize(); + + /** + * Releases resouces associated with this MediaScanner object. + * It is considered good practice to call this method when + * one is done using the MediaScanner object. After this method + * is called, the MediaScanner object can no longer be used. + */ + public void release() { + native_finalize(); + } + @Override protected void finalize() { mContext.getContentResolver().releaseProvider(mMediaProvider); diff --git a/media/java/android/media/videoeditor/AudioTrack.java b/media/java/android/media/videoeditor/AudioTrack.java index 7069b23..2de82f2 100755 --- a/media/java/android/media/videoeditor/AudioTrack.java +++ b/media/java/android/media/videoeditor/AudioTrack.java @@ -49,7 +49,6 @@ public class AudioTrack { private final int mAudioType; private final int mAudioBitrate; private final int mAudioSamplingFrequency; - /** * Ducking variables */ @@ -127,11 +126,17 @@ public class AudioTrack { int duckThreshold, int duckedTrackVolume, String audioWaveformFilename) throws IOException { Properties properties = null; + File file = new File(filename); if (!file.exists()) { throw new IOException(filename + " not found ! "); } + /*Compare file_size with 2GB*/ + if (VideoEditor.MAX_SUPPORTED_FILE_SIZE <= file.length()) { + throw new IllegalArgumentException("File size is more than 2GB"); + } + if (editor instanceof VideoEditorImpl) { mMANativeHelper = ((VideoEditorImpl)editor).getNativeContext(); } else { diff --git a/media/java/android/media/videoeditor/MediaItem.java b/media/java/android/media/videoeditor/MediaItem.java index dfe0bae..8c4841f 100755 --- a/media/java/android/media/videoeditor/MediaItem.java +++ b/media/java/android/media/videoeditor/MediaItem.java @@ -131,6 +131,15 @@ public abstract class MediaItem { if (filename == null) { throw new IllegalArgumentException("MediaItem : filename is null"); } + File file = new File(filename); + if (!file.exists()) { + throw new IOException(filename + " not found ! "); + } + + /*Compare file_size with 2GB*/ + if (VideoEditor.MAX_SUPPORTED_FILE_SIZE <= file.length()) { + throw new IllegalArgumentException("File size is more than 2GB"); + } mUniqueId = mediaItemId; mFilename = filename; mRenderingMode = renderingMode; diff --git a/media/java/android/media/videoeditor/VideoEditor.java b/media/java/android/media/videoeditor/VideoEditor.java index 122dc8d..59e4540 100755 --- a/media/java/android/media/videoeditor/VideoEditor.java +++ b/media/java/android/media/videoeditor/VideoEditor.java @@ -68,6 +68,11 @@ public interface VideoEditor { public final static int DURATION_OF_STORYBOARD = -1; /** + * Maximum supported file size + */ + public static final long MAX_SUPPORTED_FILE_SIZE = 2147483648L; + + /** * This listener interface is used by the VideoEditor to emit preview * progress notifications. This callback should be invoked after the number * of frames specified by diff --git a/media/java/android/media/videoeditor/VideoEditorImpl.java b/media/java/android/media/videoeditor/VideoEditorImpl.java index 7e1f73a..78557ee 100755 --- a/media/java/android/media/videoeditor/VideoEditorImpl.java +++ b/media/java/android/media/videoeditor/VideoEditorImpl.java @@ -119,7 +119,6 @@ public class VideoEditorImpl implements VideoEditor { private static final String ATTR_OVERLAY_FRAME_HEIGHT = "overlay_frame_height"; private static final String ATTR_OVERLAY_RESIZED_RGB_FRAME_WIDTH = "resized_RGBframe_width"; private static final String ATTR_OVERLAY_RESIZED_RGB_FRAME_HEIGHT = "resized_RGBframe_height"; - private static final int ENGINE_ACCESS_MAX_TIMEOUT_MS = 500; /* * Instance variables @@ -437,6 +436,12 @@ public class VideoEditorImpl implements VideoEditor { throw new IllegalArgumentException(message); } } + computeTimelineDuration(); + final long audioBitrate = MediaArtistNativeHelper.Bitrate.BR_96_KBPS; + final long fileSize = (mDurationMs * (bitrate + audioBitrate)) / 8000; + if (MAX_SUPPORTED_FILE_SIZE <= fileSize) { + throw new IllegalStateException("Export Size is more than 2GB"); + } boolean semAcquireDone = false; try { diff --git a/media/jni/android_media_MediaScanner.cpp b/media/jni/android_media_MediaScanner.cpp index 8bbb997..9d7bf2c 100644 --- a/media/jni/android_media_MediaScanner.cpp +++ b/media/jni/android_media_MediaScanner.cpp @@ -29,11 +29,6 @@ using namespace android; -struct fields_t { - jfieldID context; -}; -static fields_t fields; - static const char* const kClassMediaScannerClient = "android/media/MediaScannerClient"; @@ -46,6 +41,12 @@ static const char* const kRunTimeException = static const char* const kIllegalArgumentException = "java/lang/IllegalArgumentException"; +struct fields_t { + jfieldID context; +}; +static fields_t fields; +static Mutex sLock; + class MyMediaScannerClient : public MediaScannerClient { public: @@ -181,13 +182,29 @@ static bool ExceptionCheck(void* env) return ((JNIEnv *)env)->ExceptionCheck(); } +// Call this method with sLock hold +static MediaScanner *getNativeScanner_l(JNIEnv* env, jobject thiz) +{ + return (MediaScanner *) env->GetIntField(thiz, fields.context); +} + +// Call this method with sLock hold +static void setNativeScanner_l(JNIEnv* env, jobject thiz, MediaScanner *s) +{ + env->SetIntField(thiz, fields.context, (int)s); +} + static void android_media_MediaScanner_processDirectory( JNIEnv *env, jobject thiz, jstring path, jobject client) { LOGV("processDirectory"); - MediaScanner *mp = - (MediaScanner *)env->GetIntField(thiz, fields.context); + Mutex::Autolock l(sLock); + MediaScanner *mp = getNativeScanner_l(env, thiz); + if (mp == NULL) { + jniThrowException(env, kRunTimeException, "No scanner available"); + return; + } if (path == NULL) { jniThrowException(env, kIllegalArgumentException, NULL); @@ -211,8 +228,13 @@ android_media_MediaScanner_processFile( jstring mimeType, jobject client) { LOGV("processFile"); - MediaScanner *mp = - (MediaScanner *)env->GetIntField(thiz, fields.context); + + // Lock already hold by processDirectory + MediaScanner *mp = getNativeScanner_l(env, thiz); + if (mp == NULL) { + jniThrowException(env, kRunTimeException, "No scanner available"); + return; + } if (path == NULL) { jniThrowException(env, kIllegalArgumentException, NULL); @@ -246,8 +268,12 @@ android_media_MediaScanner_setLocale( JNIEnv *env, jobject thiz, jstring locale) { LOGV("setLocale"); - MediaScanner *mp = - (MediaScanner *)env->GetIntField(thiz, fields.context); + Mutex::Autolock l(sLock); + MediaScanner *mp = getNativeScanner_l(env, thiz); + if (mp == NULL) { + jniThrowException(env, kRunTimeException, "No scanner available"); + return; + } if (locale == NULL) { jniThrowException(env, kIllegalArgumentException, NULL); @@ -268,8 +294,12 @@ android_media_MediaScanner_extractAlbumArt( JNIEnv *env, jobject thiz, jobject fileDescriptor) { LOGV("extractAlbumArt"); - MediaScanner *mp = - (MediaScanner *)env->GetIntField(thiz, fields.context); + Mutex::Autolock l(sLock); + MediaScanner *mp = getNativeScanner_l(env, thiz); + if (mp == NULL) { + jniThrowException(env, kRunTimeException, "No scanner available"); + return NULL; + } if (fileDescriptor == NULL) { jniThrowException(env, kIllegalArgumentException, NULL); @@ -339,14 +369,13 @@ static void android_media_MediaScanner_native_finalize(JNIEnv *env, jobject thiz) { LOGV("native_finalize"); - MediaScanner *mp = - (MediaScanner *)env->GetIntField(thiz, fields.context); - + Mutex::Autolock l(sLock); + MediaScanner *mp = getNativeScanner_l(env, thiz); if (mp == 0) { return; } - delete mp; + setNativeScanner_l(env, thiz, 0); } static JNINativeMethod gMethods[] = { diff --git a/media/jni/mediaeditor/Android.mk b/media/jni/mediaeditor/Android.mk index f054deb..283b4ea 100755 --- a/media/jni/mediaeditor/Android.mk +++ b/media/jni/mediaeditor/Android.mk @@ -79,10 +79,6 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_MODULE:= libvideoeditor_jni -# Don't prelink this library. For more efficient code, you may want -# to add this library to the prelink map and set this to true. -LOCAL_PRELINK_MODULE := false - LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/media/libeffects/lvm/lib/Android.mk b/media/libeffects/lvm/lib/Android.mk index ff34707..f49267e 100644 --- a/media/libeffects/lvm/lib/Android.mk +++ b/media/libeffects/lvm/lib/Android.mk @@ -105,7 +105,7 @@ LOCAL_SRC_FILES:= \ LOCAL_MODULE:= libmusicbundle -LOCAL_PRELINK_MODULE := false + LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/Eq/lib \ @@ -168,7 +168,7 @@ LOCAL_SRC_FILES:= \ LOCAL_MODULE:= libreverb -LOCAL_PRELINK_MODULE := false + LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/Reverb/lib \ diff --git a/media/libeffects/lvm/wrapper/Android.mk b/media/libeffects/lvm/wrapper/Android.mk index 2e9b9b4..99cfdfa 100644 --- a/media/libeffects/lvm/wrapper/Android.mk +++ b/media/libeffects/lvm/wrapper/Android.mk @@ -13,7 +13,7 @@ LOCAL_MODULE:= libbundlewrapper LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/soundfx -LOCAL_PRELINK_MODULE := false + LOCAL_STATIC_LIBRARIES += libmusicbundle @@ -47,7 +47,7 @@ LOCAL_MODULE:= libreverbwrapper LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/soundfx -LOCAL_PRELINK_MODULE := false + LOCAL_STATIC_LIBRARIES += libreverb diff --git a/media/libeffects/visualizer/Android.mk b/media/libeffects/visualizer/Android.mk index e6ff654..3a0f438 100644 --- a/media/libeffects/visualizer/Android.mk +++ b/media/libeffects/visualizer/Android.mk @@ -25,6 +25,6 @@ endif LOCAL_C_INCLUDES := \ $(call include-path-for, graphics corecg) -LOCAL_PRELINK_MODULE := false + include $(BUILD_SHARED_LIBRARY) diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index fd4c6c6..a04fbd2 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -33,6 +33,7 @@ LOCAL_SRC_FILES:= \ IEffectClient.cpp \ AudioEffect.cpp \ Visualizer.cpp \ + MemoryLeakTrackUtil.cpp \ fixedfft.cpp.arm LOCAL_SHARED_LIBRARIES := \ diff --git a/media/libmedia/MemoryLeakTrackUtil.cpp b/media/libmedia/MemoryLeakTrackUtil.cpp new file mode 100644 index 0000000..6a108ae --- /dev/null +++ b/media/libmedia/MemoryLeakTrackUtil.cpp @@ -0,0 +1,169 @@ +/* + * Copyright 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 <media/MemoryLeakTrackUtil.h> + +#include <stdio.h> +#include <sys/types.h> +#include <unistd.h> + +/* + * The code here originally resided in MediaPlayerService.cpp and was + * shamelessly copied over to support memory leak tracking from + * multiple places. + */ +namespace android { + +#if defined(__arm__) + +extern "C" void get_malloc_leak_info(uint8_t** info, size_t* overallSize, + size_t* infoSize, size_t* totalMemory, size_t* backtraceSize); + +extern "C" void free_malloc_leak_info(uint8_t* info); + +// Use the String-class below instead of String8 to allocate all memory +// beforehand and not reenter the heap while we are examining it... +struct MyString8 { + static const size_t MAX_SIZE = 256 * 1024; + + MyString8() + : mPtr((char *)malloc(MAX_SIZE)) { + *mPtr = '\0'; + } + + ~MyString8() { + free(mPtr); + } + + void append(const char *s) { + strcat(mPtr, s); + } + + const char *string() const { + return mPtr; + } + + size_t size() const { + return strlen(mPtr); + } + +private: + char *mPtr; + + MyString8(const MyString8 &); + MyString8 &operator=(const MyString8 &); +}; + +void dumpMemoryAddresses(int fd) +{ + const size_t SIZE = 256; + char buffer[SIZE]; + MyString8 result; + + typedef struct { + size_t size; + size_t dups; + intptr_t * backtrace; + } AllocEntry; + + uint8_t *info = NULL; + size_t overallSize = 0; + size_t infoSize = 0; + size_t totalMemory = 0; + size_t backtraceSize = 0; + + get_malloc_leak_info(&info, &overallSize, &infoSize, &totalMemory, &backtraceSize); + if (info) { + uint8_t *ptr = info; + size_t count = overallSize / infoSize; + + snprintf(buffer, SIZE, " Allocation count %i\n", count); + result.append(buffer); + snprintf(buffer, SIZE, " Total memory %i\n", totalMemory); + result.append(buffer); + + AllocEntry * entries = new AllocEntry[count]; + + for (size_t i = 0; i < count; i++) { + // Each entry should be size_t, size_t, intptr_t[backtraceSize] + AllocEntry *e = &entries[i]; + + e->size = *reinterpret_cast<size_t *>(ptr); + ptr += sizeof(size_t); + + e->dups = *reinterpret_cast<size_t *>(ptr); + ptr += sizeof(size_t); + + e->backtrace = reinterpret_cast<intptr_t *>(ptr); + ptr += sizeof(intptr_t) * backtraceSize; + } + + // Now we need to sort the entries. They come sorted by size but + // not by stack trace which causes problems using diff. + bool moved; + do { + moved = false; + for (size_t i = 0; i < (count - 1); i++) { + AllocEntry *e1 = &entries[i]; + AllocEntry *e2 = &entries[i+1]; + + bool swap = e1->size < e2->size; + if (e1->size == e2->size) { + for(size_t j = 0; j < backtraceSize; j++) { + if (e1->backtrace[j] == e2->backtrace[j]) { + continue; + } + swap = e1->backtrace[j] < e2->backtrace[j]; + break; + } + } + if (swap) { + AllocEntry t = entries[i]; + entries[i] = entries[i+1]; + entries[i+1] = t; + moved = true; + } + } + } while (moved); + + for (size_t i = 0; i < count; i++) { + AllocEntry *e = &entries[i]; + + snprintf(buffer, SIZE, "size %8i, dup %4i, ", e->size, e->dups); + result.append(buffer); + for (size_t ct = 0; (ct < backtraceSize) && e->backtrace[ct]; ct++) { + if (ct) { + result.append(", "); + } + snprintf(buffer, SIZE, "0x%08x", e->backtrace[ct]); + result.append(buffer); + } + result.append("\n"); + } + + delete[] entries; + free_malloc_leak_info(info); + } + + write(fd, result.string(), result.size()); +} + +#else +// Does nothing +void dumpMemoryAddresses(int fd) {} + +#endif +} // namespace android diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index a42cca5..f075706 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -51,6 +51,7 @@ #include <media/MediaMetadataRetrieverInterface.h> #include <media/Metadata.h> #include <media/AudioTrack.h> +#include <media/MemoryLeakTrackUtil.h> #include <private/android_filesystem_config.h> @@ -392,139 +393,6 @@ static int myTid() { #endif } -#if defined(__arm__) -extern "C" void get_malloc_leak_info(uint8_t** info, size_t* overallSize, - size_t* infoSize, size_t* totalMemory, size_t* backtraceSize); -extern "C" void free_malloc_leak_info(uint8_t* info); - -// Use the String-class below instead of String8 to allocate all memory -// beforehand and not reenter the heap while we are examining it... -struct MyString8 { - static const size_t MAX_SIZE = 256 * 1024; - - MyString8() - : mPtr((char *)malloc(MAX_SIZE)) { - *mPtr = '\0'; - } - - ~MyString8() { - free(mPtr); - } - - void append(const char *s) { - strcat(mPtr, s); - } - - const char *string() const { - return mPtr; - } - - size_t size() const { - return strlen(mPtr); - } - -private: - char *mPtr; - - MyString8(const MyString8 &); - MyString8 &operator=(const MyString8 &); -}; - -void memStatus(int fd, const Vector<String16>& args) -{ - const size_t SIZE = 256; - char buffer[SIZE]; - MyString8 result; - - typedef struct { - size_t size; - size_t dups; - intptr_t * backtrace; - } AllocEntry; - - uint8_t *info = NULL; - size_t overallSize = 0; - size_t infoSize = 0; - size_t totalMemory = 0; - size_t backtraceSize = 0; - - get_malloc_leak_info(&info, &overallSize, &infoSize, &totalMemory, &backtraceSize); - if (info) { - uint8_t *ptr = info; - size_t count = overallSize / infoSize; - - snprintf(buffer, SIZE, " Allocation count %i\n", count); - result.append(buffer); - snprintf(buffer, SIZE, " Total memory %i\n", totalMemory); - result.append(buffer); - - AllocEntry * entries = new AllocEntry[count]; - - for (size_t i = 0; i < count; i++) { - // Each entry should be size_t, size_t, intptr_t[backtraceSize] - AllocEntry *e = &entries[i]; - - e->size = *reinterpret_cast<size_t *>(ptr); - ptr += sizeof(size_t); - - e->dups = *reinterpret_cast<size_t *>(ptr); - ptr += sizeof(size_t); - - e->backtrace = reinterpret_cast<intptr_t *>(ptr); - ptr += sizeof(intptr_t) * backtraceSize; - } - - // Now we need to sort the entries. They come sorted by size but - // not by stack trace which causes problems using diff. - bool moved; - do { - moved = false; - for (size_t i = 0; i < (count - 1); i++) { - AllocEntry *e1 = &entries[i]; - AllocEntry *e2 = &entries[i+1]; - - bool swap = e1->size < e2->size; - if (e1->size == e2->size) { - for(size_t j = 0; j < backtraceSize; j++) { - if (e1->backtrace[j] == e2->backtrace[j]) { - continue; - } - swap = e1->backtrace[j] < e2->backtrace[j]; - break; - } - } - if (swap) { - AllocEntry t = entries[i]; - entries[i] = entries[i+1]; - entries[i+1] = t; - moved = true; - } - } - } while (moved); - - for (size_t i = 0; i < count; i++) { - AllocEntry *e = &entries[i]; - - snprintf(buffer, SIZE, "size %8i, dup %4i, ", e->size, e->dups); - result.append(buffer); - for (size_t ct = 0; (ct < backtraceSize) && e->backtrace[ct]; ct++) { - if (ct) { - result.append(", "); - } - snprintf(buffer, SIZE, "0x%08x", e->backtrace[ct]); - result.append(buffer); - } - result.append("\n"); - } - - delete[] entries; - free_malloc_leak_info(info); - } - - write(fd, result.string(), result.size()); -} -#endif - status_t MediaPlayerService::dump(int fd, const Vector<String16>& args) { const size_t SIZE = 256; @@ -623,7 +491,6 @@ status_t MediaPlayerService::dump(int fd, const Vector<String16>& args) result.append("\n"); } -#if defined(__arm__) bool dumpMem = false; for (size_t i = 0; i < args.size(); i++) { if (args[i] == String16("-m")) { @@ -631,9 +498,8 @@ status_t MediaPlayerService::dump(int fd, const Vector<String16>& args) } } if (dumpMem) { - memStatus(fd, args); + dumpMemoryAddresses(fd); } -#endif } write(fd, result.string(), result.size()); return NO_ERROR; diff --git a/media/libstagefright/WAVExtractor.cpp b/media/libstagefright/WAVExtractor.cpp index 9332120..e9e5ef9 100644 --- a/media/libstagefright/WAVExtractor.cpp +++ b/media/libstagefright/WAVExtractor.cpp @@ -353,8 +353,6 @@ status_t WAVSource::read( return ERROR_END_OF_STREAM; } - mCurrentPos += n; - buffer->set_range(0, n); if (mWaveFormat == WAVE_FORMAT_PCM) { @@ -406,6 +404,7 @@ status_t WAVSource::read( / (mNumChannels * bytesPerSample) / mSampleRate); buffer->meta_data()->setInt32(kKeyIsSyncFrame, 1); + mCurrentPos += n; *out = buffer; diff --git a/media/libstagefright/codecs/aacenc/Android.mk b/media/libstagefright/codecs/aacenc/Android.mk index cda4f9d..f9cc6a3 100644 --- a/media/libstagefright/codecs/aacenc/Android.mk +++ b/media/libstagefright/codecs/aacenc/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) include frameworks/base/media/libstagefright/codecs/common/Config.mk -LOCAL_PRELINK_MODULE := false + LOCAL_SRC_FILES := basic_op/basicop2.c basic_op/oper_32b.c diff --git a/media/libstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp b/media/libstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp index fb300da..a11d46b 100644 --- a/media/libstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp +++ b/media/libstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp @@ -14,6 +14,10 @@ * limitations under the License. */ +//#define LOG_NDEBUG 0 +#define LOG_TAG "AMRNBDecoder" +#include <utils/Log.h> + #include "AMRNBDecoder.h" #include "gsmamr_dec.h" @@ -154,18 +158,24 @@ status_t AMRNBDecoder::read( const uint8_t *inputPtr = (const uint8_t *)mInputBuffer->data() + mInputBuffer->range_offset(); - size_t numBytesRead = + int32_t numBytesRead = AMRDecode(mState, (Frame_Type_3GPP)((inputPtr[0] >> 3) & 0x0f), (UWord8 *)&inputPtr[1], static_cast<int16_t *>(buffer->data()), MIME_IETF); + if (numBytesRead == -1 ) { + LOGE("PV AMR decoder AMRDecode() call failed"); + buffer->release(); + buffer = NULL; + return ERROR_MALFORMED; + } ++numBytesRead; // Include the frame type header byte. buffer->set_range(0, kNumSamplesPerFrame * sizeof(int16_t)); - if (numBytesRead > mInputBuffer->range_length()) { + if (static_cast<size_t>(numBytesRead) > mInputBuffer->range_length()) { // This is bad, should never have happened, but did. Abort now. buffer->release(); diff --git a/media/libstagefright/codecs/amrwbenc/Android.mk b/media/libstagefright/codecs/amrwbenc/Android.mk index 4293287..5179380 100644 --- a/media/libstagefright/codecs/amrwbenc/Android.mk +++ b/media/libstagefright/codecs/amrwbenc/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) include frameworks/base/media/libstagefright/codecs/common/Config.mk -LOCAL_PRELINK_MODULE := false + LOCAL_SRC_FILES := \ AMRWBEncoder.cpp \ diff --git a/media/libstagefright/codecs/common/Android.mk b/media/libstagefright/codecs/common/Android.mk index fffb2ad..af8795a 100644 --- a/media/libstagefright/codecs/common/Android.mk +++ b/media/libstagefright/codecs/common/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_PRELINK_MODULE := false + LOCAL_SRC_FILES := cmnMemory.c diff --git a/media/libstagefright/foundation/Android.mk b/media/libstagefright/foundation/Android.mk index 4e07f6f..d5025a1 100644 --- a/media/libstagefright/foundation/Android.mk +++ b/media/libstagefright/foundation/Android.mk @@ -25,6 +25,6 @@ LOCAL_CFLAGS += -Wno-multichar LOCAL_MODULE:= libstagefright_foundation -LOCAL_PRELINK_MODULE:= false + include $(BUILD_SHARED_LIBRARY) diff --git a/media/libstagefright/yuv/Android.mk b/media/libstagefright/yuv/Android.mk index 7697e3c..a4253f6 100644 --- a/media/libstagefright/yuv/Android.mk +++ b/media/libstagefright/yuv/Android.mk @@ -10,6 +10,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libstagefright_yuv -LOCAL_PRELINK_MODULE := false + include $(BUILD_SHARED_LIBRARY) diff --git a/media/tests/players/Android.mk b/media/tests/players/Android.mk index 10367cf..c655ae6 100644 --- a/media/tests/players/Android.mk +++ b/media/tests/players/Android.mk @@ -24,6 +24,6 @@ LOCAL_SHARED_LIBRARIES:= \ LOCAL_MODULE:= invoke_mock_media_player LOCAL_MODULE_TAGS := tests eng -LOCAL_PRELINK_MODULE:= false + include $(BUILD_SHARED_LIBRARY) diff --git a/native/android/native_window.cpp b/native/android/native_window.cpp index 219cd196..ae1993d 100644 --- a/native/android/native_window.cpp +++ b/native/android/native_window.cpp @@ -74,6 +74,12 @@ int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window, int32_t width, int32_t ANativeWindow_lock(ANativeWindow* window, ANativeWindow_Buffer* outBuffer, ARect* inOutDirtyBounds) { + int type = -1; + if (window->query(window, NATIVE_WINDOW_CONCRETE_TYPE, &type) != 0 || + type != NATIVE_WINDOW_SURFACE) { + return BAD_VALUE; + } + Region dirtyRegion; Region* dirtyParam = NULL; if (inOutDirtyBounds != NULL) { diff --git a/nfc-extras/Android.mk b/nfc-extras/Android.mk index 2033508..131d898 100644 --- a/nfc-extras/Android.mk +++ b/nfc-extras/Android.mk @@ -10,5 +10,5 @@ LOCAL_MODULE:= com.android.nfc_extras include $(BUILD_JAVA_LIBRARY) -# put the com.android.nfc_extras.jar into the dist directory -$(call dist-for-goals, droidcore, $(LOCAL_BUILT_MODULE):com.android.nfc_extras.jar) +# put the classes.jar, with full class files instead of classes.dex inside, into the dist directory +$(call dist-for-goals, droidcore, $(full_classes_jar):com.android.nfc_extras.jar) diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 861d7ac..7ce86b3 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -1130,6 +1130,16 @@ EGLSurface eglCreateWindowSurface( EGLDisplay dpy, EGLConfig config, EGLConfig iConfig = dp->configs[intptr_t(config)].config; EGLint format; + // for now fail if the window is not a Surface. + int type = -1; + ANativeWindow* anw = reinterpret_cast<ANativeWindow*>(window); + if ((anw->query(window, NATIVE_WINDOW_CONCRETE_TYPE, &type) != 0) || + (type == NATIVE_WINDOW_SURFACE_TEXTURE_CLIENT)) { + LOGE("native window is a SurfaceTextureClient (currently " + "unsupported)"); + return setError(EGL_BAD_NATIVE_WINDOW, EGL_NO_SURFACE); + } + // set the native window's buffers format to match this config if (cnx->egl.eglGetConfigAttrib(iDpy, iConfig, EGL_NATIVE_VISUAL_ID, &format)) { diff --git a/opengl/tests/gl2_jni/Android.mk b/opengl/tests/gl2_jni/Android.mk index 384966c..e8b6c57 100644 --- a/opengl/tests/gl2_jni/Android.mk +++ b/opengl/tests/gl2_jni/Android.mk @@ -44,7 +44,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := libgl2jni -LOCAL_PRELINK_MODULE := false + include $(BUILD_SHARED_LIBRARY) diff --git a/opengl/tests/gl2_yuvtex/gl2_yuvtex.cpp b/opengl/tests/gl2_yuvtex/gl2_yuvtex.cpp index 602ea1a..f0b8d12 100644 --- a/opengl/tests/gl2_yuvtex/gl2_yuvtex.cpp +++ b/opengl/tests/gl2_yuvtex/gl2_yuvtex.cpp @@ -186,11 +186,6 @@ const int yuvTexUsage = GraphicBuffer::USAGE_HW_TEXTURE | GraphicBuffer::USAGE_SW_WRITE_RARELY; const int yuvTexFormat = HAL_PIXEL_FORMAT_YV12; const int yuvTexOffsetY = 0; -const int yuvTexStrideY = (yuvTexWidth + 0xf) & ~0xf; -const int yuvTexOffsetV = yuvTexStrideY * yuvTexHeight; -const int yuvTexStrideV = (yuvTexStrideY/2 + 0xf) & ~0xf; -const int yuvTexOffsetU = yuvTexOffsetV + yuvTexStrideV * yuvTexHeight/2; -const int yuvTexStrideU = yuvTexStrideV; const bool yuvTexSameUV = false; static sp<GraphicBuffer> yuvTexBuffer; static GLuint yuvTex; @@ -200,6 +195,11 @@ bool setupYuvTexSurface(EGLDisplay dpy, EGLContext context) { int blockHeight = yuvTexHeight > 16 ? yuvTexHeight / 16 : 1; yuvTexBuffer = new GraphicBuffer(yuvTexWidth, yuvTexHeight, yuvTexFormat, yuvTexUsage); + int yuvTexStrideY = yuvTexBuffer->getStride(); + int yuvTexOffsetV = yuvTexStrideY * yuvTexHeight; + int yuvTexStrideV = (yuvTexStrideY/2 + 0xf) & ~0xf; + int yuvTexOffsetU = yuvTexOffsetV + yuvTexStrideV * yuvTexHeight/2; + int yuvTexStrideU = yuvTexStrideV; char* buf = NULL; status_t err = yuvTexBuffer->lock(GRALLOC_USAGE_SW_WRITE_OFTEN, (void**)(&buf)); if (err != 0) { diff --git a/opengl/tests/gl_jni/Android.mk b/opengl/tests/gl_jni/Android.mk index f1bd31d..4acd91f 100644 --- a/opengl/tests/gl_jni/Android.mk +++ b/opengl/tests/gl_jni/Android.mk @@ -46,7 +46,7 @@ LOCAL_MODULE := libgljni LOCAL_ARM_MODE := arm -LOCAL_PRELINK_MODULE := false + include $(BUILD_SHARED_LIBRARY) diff --git a/opengl/tests/gl_perfapp/Android.mk b/opengl/tests/gl_perfapp/Android.mk index dd75a74..4b79569 100644 --- a/opengl/tests/gl_perfapp/Android.mk +++ b/opengl/tests/gl_perfapp/Android.mk @@ -47,7 +47,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := libglperf -LOCAL_PRELINK_MODULE := false + include $(BUILD_SHARED_LIBRARY) diff --git a/opengl/tests/gldual/Android.mk b/opengl/tests/gldual/Android.mk index 995a5d7..f1a998a 100644 --- a/opengl/tests/gldual/Android.mk +++ b/opengl/tests/gldual/Android.mk @@ -44,7 +44,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := libgldualjni -LOCAL_PRELINK_MODULE := false + include $(BUILD_SHARED_LIBRARY) diff --git a/opengl/tests/hwc/Android.mk b/opengl/tests/hwc/Android.mk index 6312970..e4d7e28 100644 --- a/opengl/tests/hwc/Android.mk +++ b/opengl/tests/hwc/Android.mk @@ -29,7 +29,7 @@ LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_SHARED_LIBRARIES += libcutils libutils libstlport LOCAL_STATIC_LIBRARIES += libglTest -LOCAL_PRELINK_MODULE := false + include $(BUILD_STATIC_LIBRARY) diff --git a/opengl/tests/lib/Android.mk b/opengl/tests/lib/Android.mk index 7542ac4..ac1e183 100644 --- a/opengl/tests/lib/Android.mk +++ b/opengl/tests/lib/Android.mk @@ -27,6 +27,6 @@ LOCAL_C_INCLUDES += system/extras/tests/include \ LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_SHARED_LIBRARIES += libcutils libutils libstlport -LOCAL_PRELINK_MODULE := false + include $(BUILD_STATIC_LIBRARY) diff --git a/packages/DefaultContainerService/jni/Android.mk b/packages/DefaultContainerService/jni/Android.mk index a2febec..79ff451 100644 --- a/packages/DefaultContainerService/jni/Android.mk +++ b/packages/DefaultContainerService/jni/Android.mk @@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_PRELINK_MODULE := false + LOCAL_SRC_FILES := \ com_android_defcontainer_MeasurementUtils.cpp diff --git a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java index 21f77e3..15c1653 100644 --- a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java +++ b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java @@ -47,7 +47,7 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipException; @@ -117,7 +117,7 @@ public class DefaultContainerService extends IntentService { * @return Returns PackageInfoLite object containing * the package info and recommended app location. */ - public PackageInfoLite getMinimalPackageInfo(final Uri fileUri, int flags) { + public PackageInfoLite getMinimalPackageInfo(final Uri fileUri, int flags, long threshold) { PackageInfoLite ret = new PackageInfoLite(); if (fileUri == null) { Log.i(TAG, "Invalid package uri " + fileUri); @@ -131,15 +131,9 @@ public class DefaultContainerService extends IntentService { return ret; } String archiveFilePath = fileUri.getPath(); - PackageParser packageParser = new PackageParser(archiveFilePath); - File sourceFile = new File(archiveFilePath); DisplayMetrics metrics = new DisplayMetrics(); metrics.setToDefaults(); - PackageParser.PackageLite pkg = packageParser.parsePackageLite( - archiveFilePath, 0); - // Nuke the parser reference right away and force a gc - packageParser = null; - Runtime.getRuntime().gc(); + PackageParser.PackageLite pkg = PackageParser.parsePackageLite(archiveFilePath, 0); if (pkg == null) { Log.w(TAG, "Failed to parse package"); ret.recommendedInstallLocation = PackageHelper.RECOMMEND_FAILED_INVALID_APK; @@ -147,12 +141,22 @@ public class DefaultContainerService extends IntentService { } ret.packageName = pkg.packageName; ret.installLocation = pkg.installLocation; - ret.recommendedInstallLocation = recommendAppInstallLocation(pkg.installLocation, archiveFilePath, flags); + ret.recommendedInstallLocation = recommendAppInstallLocation(pkg.installLocation, + archiveFilePath, flags, threshold); return ret; } - public boolean checkFreeStorage(boolean external, Uri fileUri) { - return checkFreeStorageInner(external, fileUri); + @Override + public boolean checkInternalFreeStorage(Uri packageUri, long threshold) + throws RemoteException { + final File apkFile = new File(packageUri.getPath()); + return isUnderInternalThreshold(apkFile, threshold); + } + + @Override + public boolean checkExternalFreeStorage(Uri packageUri) throws RemoteException { + final File apkFile = new File(packageUri.getPath()); + return isUnderExternalThreshold(apkFile); } public ObbInfo getObbInfo(String filename) { @@ -225,41 +229,15 @@ public class DefaultContainerService extends IntentService { String codePath = packageURI.getPath(); File codeFile = new File(codePath); - // Calculate size of container needed to hold base APK. - long sizeBytes = codeFile.length(); - - // Check all the native files that need to be copied and add that to the container size. - ZipFile zipFile; - List<Pair<ZipEntry, String>> nativeFiles; - try { - zipFile = new ZipFile(codeFile); - - nativeFiles = new LinkedList<Pair<ZipEntry, String>>(); - - NativeLibraryHelper.listPackageNativeBinariesLI(zipFile, nativeFiles); + // Native files we need to copy to the container. + List<Pair<ZipEntry, String>> nativeFiles = new ArrayList<Pair<ZipEntry, String>>(); - final int N = nativeFiles.size(); - for (int i = 0; i < N; i++) { - final Pair<ZipEntry, String> entry = nativeFiles.get(i); - - /* - * Note that PackageHelper.createSdDir adds a 1MB padding on - * our claimed size, so we don't have to worry about block - * alignment here. - */ - sizeBytes += entry.first.getSize(); - } - } catch (ZipException e) { - Log.w(TAG, "Failed to extract data from package file", e); - return null; - } catch (IOException e) { - Log.w(TAG, "Failed to cache package shared libs", e); - return null; - } + // Calculate size of container needed to hold base APK. + final int sizeMb = calculateContainerSize(codeFile, nativeFiles); // Create new container String newCachePath = null; - if ((newCachePath = PackageHelper.createSdDir(sizeBytes, newCid, key, Process.myUid())) == null) { + if ((newCachePath = PackageHelper.createSdDir(sizeMb, newCid, key, Process.myUid())) == null) { Log.e(TAG, "Failed to create container " + newCid); return null; } @@ -274,6 +252,8 @@ public class DefaultContainerService extends IntentService { } try { + ZipFile zipFile = new ZipFile(codeFile); + File sharedLibraryDir = new File(newCachePath, LIB_DIR_NAME); sharedLibraryDir.mkdir(); @@ -386,159 +366,196 @@ public class DefaultContainerService extends IntentService { return true; } - // Constants related to app heuristics - // No-installation limit for internal flash: 10% or less space available - private static final double LOW_NAND_FLASH_TRESHOLD = 0.1; + private static final int PREFER_INTERNAL = 1; + private static final int PREFER_EXTERNAL = 2; - // SD-to-internal app size threshold: currently set to 1 MB - private static final long INSTALL_ON_SD_THRESHOLD = (1024 * 1024); - private static final int ERR_LOC = -1; - - private int recommendAppInstallLocation(int installLocation, - String archiveFilePath, int flags) { - boolean checkInt = false; - boolean checkExt = false; + private int recommendAppInstallLocation(int installLocation, String archiveFilePath, int flags, + long threshold) { + int prefer; boolean checkBoth = false; + check_inner : { - // Check flags. + /* + * Explicit install flags should override the manifest settings. + */ if ((flags & PackageManager.INSTALL_FORWARD_LOCK) != 0) { - // Check for forward locked app - checkInt = true; + /* + * Forward-locked applications cannot be installed on SD card, + * so only allow checking internal storage. + */ + prefer = PREFER_INTERNAL; break check_inner; } else if ((flags & PackageManager.INSTALL_INTERNAL) != 0) { - // Explicit flag to install internally. - // Check internal storage and return - checkInt = true; + prefer = PREFER_INTERNAL; break check_inner; } else if ((flags & PackageManager.INSTALL_EXTERNAL) != 0) { - // Explicit flag to install externally. - // Check external storage and return - checkExt = true; + prefer = PREFER_EXTERNAL; break check_inner; } - // Check for manifest option + + /* No install flags. Check for manifest option. */ if (installLocation == PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY) { - checkInt = true; + prefer = PREFER_INTERNAL; break check_inner; } else if (installLocation == PackageInfo.INSTALL_LOCATION_PREFER_EXTERNAL) { - checkExt = true; + prefer = PREFER_EXTERNAL; checkBoth = true; break check_inner; } else if (installLocation == PackageInfo.INSTALL_LOCATION_AUTO) { - checkInt = true; + // We default to preferring internal storage. + prefer = PREFER_INTERNAL; checkBoth = true; break check_inner; } + // Pick user preference int installPreference = Settings.System.getInt(getApplicationContext() .getContentResolver(), Settings.Secure.DEFAULT_INSTALL_LOCATION, PackageHelper.APP_INSTALL_AUTO); if (installPreference == PackageHelper.APP_INSTALL_INTERNAL) { - checkInt = true; + prefer = PREFER_INTERNAL; break check_inner; } else if (installPreference == PackageHelper.APP_INSTALL_EXTERNAL) { - checkExt = true; + prefer = PREFER_EXTERNAL; break check_inner; } - // Fall back to default policy if nothing else is specified. - checkInt = true; + + /* + * Fall back to default policy of internal-only if nothing else is + * specified. + */ + prefer = PREFER_INTERNAL; } - // Package size = code size + cache size + data size - // If code size > 1 MB, install on SD card. - // Else install on internal NAND flash, unless space on NAND is less than 10% - String status = Environment.getExternalStorageState(); - long availSDSize = -1; - boolean mediaAvailable = false; - if (!Environment.isExternalStorageEmulated() && status.equals(Environment.MEDIA_MOUNTED)) { - StatFs sdStats = new StatFs( - Environment.getExternalStorageDirectory().getPath()); - availSDSize = (long)sdStats.getAvailableBlocks() * - (long)sdStats.getBlockSize(); - mediaAvailable = true; + final boolean emulated = Environment.isExternalStorageEmulated(); + + final File apkFile = new File(archiveFilePath); + + boolean fitsOnInternal = false; + if (checkBoth || prefer == PREFER_INTERNAL) { + fitsOnInternal = isUnderInternalThreshold(apkFile, threshold); } - StatFs internalStats = new StatFs(Environment.getDataDirectory().getPath()); - long totalInternalSize = (long)internalStats.getBlockCount() * - (long)internalStats.getBlockSize(); - long availInternalSize = (long)internalStats.getAvailableBlocks() * - (long)internalStats.getBlockSize(); - - double pctNandFree = (double)availInternalSize / (double)totalInternalSize; - - File apkFile = new File(archiveFilePath); - long pkgLen = apkFile.length(); - - // To make final copy - long reqInstallSize = pkgLen; - // For dex files. Just ignore and fail when extracting. Max limit of 2Gig for now. - long reqInternalSize = 0; - boolean intThresholdOk = (pctNandFree >= LOW_NAND_FLASH_TRESHOLD); - boolean intAvailOk = ((reqInstallSize + reqInternalSize) < availInternalSize); + boolean fitsOnSd = false; - if (mediaAvailable && (reqInstallSize < availSDSize)) { - // If we do not have an internal size requirement - // don't do a threshold check. - if (reqInternalSize == 0) { - fitsOnSd = true; - } else if ((reqInternalSize < availInternalSize) && intThresholdOk) { - fitsOnSd = true; - } + if (!emulated && (checkBoth || prefer == PREFER_EXTERNAL)) { + fitsOnSd = isUnderExternalThreshold(apkFile); } - boolean fitsOnInt = intThresholdOk && intAvailOk; - if (checkInt) { - // Check for internal memory availability - if (fitsOnInt) { + + if (prefer == PREFER_INTERNAL) { + if (fitsOnInternal) { return PackageHelper.RECOMMEND_INSTALL_INTERNAL; } - } else if (checkExt) { + } else if (!emulated && prefer == PREFER_EXTERNAL) { if (fitsOnSd) { return PackageHelper.RECOMMEND_INSTALL_EXTERNAL; } } + if (checkBoth) { - // Check for internal first - if (fitsOnInt) { + if (fitsOnInternal) { return PackageHelper.RECOMMEND_INSTALL_INTERNAL; - } - // Check for external next - if (fitsOnSd) { + } else if (!emulated && fitsOnSd) { return PackageHelper.RECOMMEND_INSTALL_EXTERNAL; } } - if ((checkExt || checkBoth) && !mediaAvailable) { + + /* + * If they requested to be on the external media by default, return that + * the media was unavailable. Otherwise, indicate there was insufficient + * storage space available. + */ + if (!emulated && (checkBoth || prefer == PREFER_EXTERNAL) + && !Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) { return PackageHelper.RECOMMEND_MEDIA_UNAVAILABLE; + } else { + return PackageHelper.RECOMMEND_FAILED_INSUFFICIENT_STORAGE; } - return PackageHelper.RECOMMEND_FAILED_INSUFFICIENT_STORAGE; } - private boolean checkFreeStorageInner(boolean external, Uri packageURI) { - File apkFile = new File(packageURI.getPath()); - long size = apkFile.length(); - if (external) { - String status = Environment.getExternalStorageState(); - long availSDSize = -1; - if (status.equals(Environment.MEDIA_MOUNTED)) { - StatFs sdStats = new StatFs( - Environment.getExternalStorageDirectory().getPath()); - availSDSize = (long)sdStats.getAvailableBlocks() * - (long)sdStats.getBlockSize(); + private boolean isUnderInternalThreshold(File apkFile, long threshold) { + final long size = apkFile.length(); + + final StatFs internalStats = new StatFs(Environment.getDataDirectory().getPath()); + final long availInternalSize = (long) internalStats.getAvailableBlocks() + * (long) internalStats.getBlockSize(); + + return (availInternalSize - size) > threshold; + } + + + private boolean isUnderExternalThreshold(File apkFile) { + if (Environment.isExternalStorageEmulated()) { + return false; + } + + final int sizeMb = calculateContainerSize(apkFile, null); + + final int availSdMb; + if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) { + StatFs sdStats = new StatFs(Environment.getExternalStorageDirectory().getPath()); + long availSdSize = (long) (sdStats.getAvailableBlocks() * sdStats.getBlockSize()); + availSdMb = (int) (availSdSize >> 20); + } else { + availSdMb = -1; + } + + return availSdMb > sizeMb; + } + + /** + * Calculate the container size for an APK. Takes into account the + * + * @param apkFile file from which to calculate size + * @return size in megabytes (2^20 bytes) + */ + private int calculateContainerSize(File apkFile, List<Pair<ZipEntry, String>> outFiles) { + // Calculate size of container needed to hold base APK. + long sizeBytes = apkFile.length(); + + // Check all the native files that need to be copied and add that to the + // container size. + ZipFile zipFile; + final List<Pair<ZipEntry, String>> nativeFiles; + try { + zipFile = new ZipFile(apkFile); + + if (outFiles != null) { + nativeFiles = outFiles; + } else { + nativeFiles = new ArrayList<Pair<ZipEntry, String>>(); + } + + NativeLibraryHelper.listPackageNativeBinariesLI(zipFile, nativeFiles); + + final int N = nativeFiles.size(); + for (int i = 0; i < N; i++) { + final Pair<ZipEntry, String> entry = nativeFiles.get(i); + + /* + * Note a 1MB padding is added to the claimed size, so we don't + * have to worry about block alignment here. + */ + sizeBytes += entry.first.getSize(); } - return availSDSize > size; + } catch (ZipException e) { + Log.w(TAG, "Failed to extract data from package file", e); + } catch (IOException e) { + Log.w(TAG, "Failed to cache package shared libs", e); } - StatFs internalStats = new StatFs(Environment.getDataDirectory().getPath()); - long totalInternalSize = (long)internalStats.getBlockCount() * - (long)internalStats.getBlockSize(); - long availInternalSize = (long)internalStats.getAvailableBlocks() * - (long)internalStats.getBlockSize(); - - double pctNandFree = (double)availInternalSize / (double)totalInternalSize; - // To make final copy - long reqInstallSize = size; - // For dex files. Just ignore and fail when extracting. Max limit of 2Gig for now. - long reqInternalSize = 0; - boolean intThresholdOk = (pctNandFree >= LOW_NAND_FLASH_TRESHOLD); - boolean intAvailOk = ((reqInstallSize + reqInternalSize) < availInternalSize); - return intThresholdOk && intAvailOk; + + int sizeMb = (int) (sizeBytes >> 20); + if ((sizeBytes - (sizeMb * 1024 * 1024)) > 0) { + sizeMb++; + } + + /* + * Add buffer size because we don't have a good way to determine the + * real FAT size. Your FAT size varies with how many directory entries + * you need, how big the whole filesystem is, and other such headaches. + */ + sizeMb++; + + return sizeMb; } } diff --git a/packages/SystemUI/res/values-ar-xlarge/strings.xml b/packages/SystemUI/res/values-ar-xlarge/strings.xml index af0eed0..d4fb873 100644 --- a/packages/SystemUI/res/values-ar-xlarge/strings.xml +++ b/packages/SystemUI/res/values-ar-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi متصل"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"جارٍ البحث عن GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"تم تعيين الموقع بواسطة GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"إيقاف التنبيهات"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"انقر هنا لإعادة تشغيل التنبيهات."</string> </resources> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 486dacc..5f29418 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -34,7 +34,8 @@ <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_airplane" msgid="4879879698500955300">"وضع الطائرة"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"تأمين اتجاه الشاشة"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"كتم"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"تلقائي"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"التنبيهات"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"تم إنشاء الاتصال بالإنترنت عن طريق البلوتوث."</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"تهيئة طرق الإدخال"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"استخدام لوحة المفاتيح الفعلية"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-bg-xlarge/strings.xml b/packages/SystemUI/res/values-bg-xlarge/strings.xml index d44366d..4e730ae 100644 --- a/packages/SystemUI/res/values-bg-xlarge/strings.xml +++ b/packages/SystemUI/res/values-bg-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi: има връзка"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Търси се GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Местоположението е зададено от GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Известията са изключени"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Докоснете тук, за да включите отново известията."</string> </resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index df6ef71..174d024 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -34,7 +34,8 @@ <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_airplane" msgid="4879879698500955300">"Самолетен режим"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Заключване на ориентацията"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"БЕЗ"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"АВТ."</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Известия"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth има връзка с тетъринг"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Конфигуриране на въвеждането"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Използване на физ. клав."</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ca-xlarge/strings.xml b/packages/SystemUI/res/values-ca-xlarge/strings.xml index a0ace2c..9fc74d0 100644 --- a/packages/SystemUI/res/values-ca-xlarge/strings.xml +++ b/packages/SystemUI/res/values-ca-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi: connectat"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"S\'està cercant un GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"S\'ha establert la ubicació per GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Notificacions desactivades"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Pica aquí per tornar a activar les notificacions."</string> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 2993e8b..80979c0 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Configuració"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Mode d\'avió"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Bloquejar orientació pantalla"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"Silen."</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTOM."</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notificacions"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth sense fil"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Configura mètodes d\'entrada"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Utilitza un teclat físic"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-cs-xlarge/strings.xml b/packages/SystemUI/res/values-cs-xlarge/strings.xml index 5fe365c..05b1248 100644 --- a/packages/SystemUI/res/values-cs-xlarge/strings.xml +++ b/packages/SystemUI/res/values-cs-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi: připojeno"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Vyhledávání satelitů GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Poloha nastavena pomocí GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Oznámení jsou vypnuta"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Chcete-li oznámení znovu zapnout, klepněte sem."</string> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 29ab1a7..31bf102 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Nastavení"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Režim V letadle"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Uzamknout orientaci obrazovky"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"ZTLUM."</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTOM."</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Oznámení"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Datové připojení Bluetooth se sdílí"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Nakonfigurovat metody vstupu"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Použít fyz. klávesnici"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-da-xlarge/strings.xml b/packages/SystemUI/res/values-da-xlarge/strings.xml index ae430b3..dd20e64 100644 --- a/packages/SystemUI/res/values-da-xlarge/strings.xml +++ b/packages/SystemUI/res/values-da-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi er forbundet"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Søger efter GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Placeringen er angivet ved hjælp af GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Meddelelser: Fra"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Tryk her for at slå meddelelser til igen."</string> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 81122a8..3a08cc1 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Indstillinger"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Flytilstand"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Lås skærmretning"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"LYDLØS"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Meddelelser"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth-tethering anvendt"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Konfigurer inputmetoder"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Brug fysisk tastatur"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-de-xlarge/strings.xml b/packages/SystemUI/res/values-de-xlarge/strings.xml index 825cd0d..cc782da 100644 --- a/packages/SystemUI/res/values-de-xlarge/strings.xml +++ b/packages/SystemUI/res/values-de-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Mit WLAN verbunden"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Suche nach GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Standort durch GPS festgelegt"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Benachrichtigungen aus"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Tippen Sie hier, um Benachrichtigungen wieder einzuschalten."</string> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 1ea87e8..91e56d4 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -34,14 +34,31 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Einstellungen"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"WLAN"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Flugmodus"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Bildschirmausrichtung sperren"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"STUMM"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Benachrichtigungen"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Zuletzt verwendet"</string> - <string name="recent_tasks_empty" msgid="1905484479067697884">"Keine neuen Anwendungen"</string> + <string name="recent_tasks_empty" msgid="1905484479067697884">"Keine zuletzt verwendeten Anwendungen"</string> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Google Apps"</string> <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth-Tethering aktiv"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Eingabemethoden konfigurieren"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Physische Tastatur"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-el-xlarge/strings.xml b/packages/SystemUI/res/values-el-xlarge/strings.xml index 4902bb5..4f7814a 100644 --- a/packages/SystemUI/res/values-el-xlarge/strings.xml +++ b/packages/SystemUI/res/values-el-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi: συνδέθηκε"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Αναζήτηση για GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Ρύθμιση τοποθεσίας με GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Ειδοποιήσεις ανενεργές"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Πατήστε εδώ για να ενεργοποιήσετε τις ειδοποιήσεις"</string> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index cd412f4..3bc5636 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -34,7 +34,8 @@ <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_airplane" msgid="4879879698500955300">"Λειτουργία πτήσης"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Κλείδωμα προσανατολ. οθόνης"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"ΣΙΓΑΣΗ"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"ΑΥΤΟΜ."</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Ειδοποιήσεις"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Έγινε σύνδεση μέσω Bluetooth"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Διαμόρφωση μεθόδων εισαγωγής"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Χρήση κανονικού πληκτρολ."</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-en-rGB-xlarge/strings.xml b/packages/SystemUI/res/values-en-rGB-xlarge/strings.xml index de1eb52..68986f0 100644 --- a/packages/SystemUI/res/values-en-rGB-xlarge/strings.xml +++ b/packages/SystemUI/res/values-en-rGB-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi connected"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Searching for GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Location set by GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Notifications off"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Tap here to turn notifications back on."</string> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 2bd662b..2e5a722 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Settings"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Airplane mode"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Lock screen orientation"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"MUTE"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notifications"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth tethered"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Configure input methods"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Use physical keyboard"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-es-rUS-xlarge/strings.xml b/packages/SystemUI/res/values-es-rUS-xlarge/strings.xml index 2ace144..fa9b762 100644 --- a/packages/SystemUI/res/values-es-rUS-xlarge/strings.xml +++ b/packages/SystemUI/res/values-es-rUS-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"WiFi conectado"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Buscando GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"La ubicación se estableció por GPS."</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Notificaciones desactivadas"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Presiona aquí para volver a activar las notificaciones."</string> </resources> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 2c50160..19d72c7 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -19,7 +19,7 @@ <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">"Sistema UI"</string> + <string name="app_label" msgid="7164937344850004466">"IU del sistema"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Borrar"</string> <string name="status_bar_do_not_disturb_button" msgid="5812628897510997853">"No molestar"</string> <string name="status_bar_please_disturb_button" msgid="3345398298841572813">"Mostrar notificaciones"</string> @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Configuración"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Modo avión"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Bloq orient de pant"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"SILENC"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notificaciones"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth anclado"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Configurar métodos de entrada"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Usar teclado físico"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-es-xlarge/strings.xml b/packages/SystemUI/res/values-es-xlarge/strings.xml index dd490fb..a7588da 100644 --- a/packages/SystemUI/res/values-es-xlarge/strings.xml +++ b/packages/SystemUI/res/values-es-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Con conexión WiFi"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Buscando GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Ubicación definida por GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Notificaciones desactivadas"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Toca aquí para volver a activar las notificaciones."</string> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 8d9cc5c..e410f6e 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Ajustes"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Modo avión"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Bloquear orientación pantalla"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"SILENC"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notificaciones"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth anclado"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Configurar métodos de introducción"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Utilizar teclado físico"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fa-xlarge/strings.xml b/packages/SystemUI/res/values-fa-xlarge/strings.xml index 6e0654d..a8e2543 100644 --- a/packages/SystemUI/res/values-fa-xlarge/strings.xml +++ b/packages/SystemUI/res/values-fa-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi متصل شد"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"جستجوی GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"مکان تنظیم شده توسط GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"اعلان ها خاموش"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"برای روشن کردن مجدد اعلان ها، اینجا را ضربه بزنید."</string> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 1e0f1e9..c9a1a7f 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -34,7 +34,8 @@ <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_airplane" msgid="4879879698500955300">"حالت هواپیما"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"قفل جهت صفحه"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"بیصدا"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"خودکار"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"اعلان ها"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"اتصال اینترنتی با بلوتوث تلفن همراه"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"پیکربندی روش های ورودی"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"از صفحه کلید فیزیکی استفاده کنید"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fi-xlarge/strings.xml b/packages/SystemUI/res/values-fi-xlarge/strings.xml index 7d49e9b..754c577 100644 --- a/packages/SystemUI/res/values-fi-xlarge/strings.xml +++ b/packages/SystemUI/res/values-fi-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wifi yhdistetty"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Haetaan GPS-yhteyttä"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Sijainti määritetty GPS:n avulla"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Ilmoitukset pois käytöstä"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Ota ilmoitukset uudelleen käyttöön napauttamalla tätä."</string> </resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index e2f935a..882261d 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Asetukset"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"WiFi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Lentokonetila"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Lukitse ruudun suunta"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"ÄÄNET."</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Ilmoitukset"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth yhdistetty"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Määritä syöttötavat"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Käytä fyysistä näppäimistöä"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fr-xlarge/strings.xml b/packages/SystemUI/res/values-fr-xlarge/strings.xml index 98dc6c0..08f673d 100644 --- a/packages/SystemUI/res/values-fr-xlarge/strings.xml +++ b/packages/SystemUI/res/values-fr-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Connecté au Wi-Fi"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Recherche de GPS en cours"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Position définie par GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Notifications désactivées"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Appuyez ici pour réactiver les notifications."</string> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 9bd1886..2b23276 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Paramètres"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Mode Avion"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Verrouiller orientation écran"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"MUET"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notifications"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Connexion Bluetooth partagée"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Configurer les modes de saisie"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Utiliser clavier physique"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hr-xlarge/strings.xml b/packages/SystemUI/res/values-hr-xlarge/strings.xml index 08adaf0..b6e15dc 100644 --- a/packages/SystemUI/res/values-hr-xlarge/strings.xml +++ b/packages/SystemUI/res/values-hr-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi: povezano"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Pretraživanje GPS-a"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Lokaciju utvrdio GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Obavijesti isključene"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Dotaknite ovdje da biste ponovo uključili obavijesti."</string> </resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index 8034eb7..dad674b 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Postavke"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Način rada u zrakoplovu"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Zaključaj orijentaciju zaslona"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"Bez zv."</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTOM."</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Obavijesti"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth posredno povezan"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Konfiguriraj načine ulaza"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Rabi fizičku tipkovnicu"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hu-xlarge/strings.xml b/packages/SystemUI/res/values-hu-xlarge/strings.xml index 41d60fc..fe2e5ee 100644 --- a/packages/SystemUI/res/values-hu-xlarge/strings.xml +++ b/packages/SystemUI/res/values-hu-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi csatlakozva"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"GPS keresése"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"A GPS beállította a helyet"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Értesítések kikapcsolva"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Itt érintse meg az értesítések bekapcsolásához."</string> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 9a91b13..9da81ab 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Beállítások"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Repülőgép üzemmód"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Telefon tájolásának zárolása"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"NÉMÍT"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Értesítések"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth megosztva"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Beviteli módok konfigurálása"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Valódi bill. használata"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-in-xlarge/strings.xml b/packages/SystemUI/res/values-in-xlarge/strings.xml index 8d95060..a4ca341 100644 --- a/packages/SystemUI/res/values-in-xlarge/strings.xml +++ b/packages/SystemUI/res/values-in-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi tersambung"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Menelusuri GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Lokasi yang disetel oleh GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Pemberitahuan mati"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Ketuk di sini untuk menghidupkan lagi pemberitahuan."</string> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 8d3cfb1..0ade50c 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Setelan"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Mode pesawat"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Kunci orientasi layar"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"BISUKAN"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Pemberitahuan"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth tertambat"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Konfigurasikan metode masukan"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Gunakan keyboard fisik"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-it-xlarge/strings.xml b/packages/SystemUI/res/values-it-xlarge/strings.xml index 68393fb..24d88744 100644 --- a/packages/SystemUI/res/values-it-xlarge/strings.xml +++ b/packages/SystemUI/res/values-it-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi: connesso"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Ricerca del GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Posizione stabilita dal GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Notifiche disattivate"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Tocca qui per riattivare le notifiche."</string> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 9e7f53a..71e86da 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Impostazioni"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Modalità aereo"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Blocca orientamento schermo"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"MUTE"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notifiche"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth con tethering"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Configura metodi di input"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Utilizza tastiera fisica"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-iw-xlarge/strings.xml b/packages/SystemUI/res/values-iw-xlarge/strings.xml index fd3ce0e..97172b8 100644 --- a/packages/SystemUI/res/values-iw-xlarge/strings.xml +++ b/packages/SystemUI/res/values-iw-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi מחובר"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"מחפש GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"מיקום מוגדר על ידי GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"מצב התראות כבוי"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"הקש כאן כדי להפעיל מחדש את ההתראות."</string> </resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index a242d04..4e78670 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -34,7 +34,8 @@ <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_airplane" msgid="4879879698500955300">"מצב טיסה"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"נעל כיוון מסך"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"השתק"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"אוטומטי"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"התראות"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth קשור"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"הגדר שיטות קלט"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"השתמש במקלדת הפיזית"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ja-xlarge/strings.xml b/packages/SystemUI/res/values-ja-xlarge/strings.xml index c7c0824..e67e0e1 100644 --- a/packages/SystemUI/res/values-ja-xlarge/strings.xml +++ b/packages/SystemUI/res/values-ja-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi接続済み"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"GPSで検索中"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"GPSにより現在地が設定されました"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"通知OFF"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"通知を有効にするにはここをタップします。"</string> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 869688c..86a5da5 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -34,7 +34,8 @@ <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_airplane" msgid="4879879698500955300">"機内モード"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"画面の向きをロック"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"ミュート"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"オート"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"通知"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetoothテザリング接続"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"入力方法の設定"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"物理キーボードを使用"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ko-xlarge/strings.xml b/packages/SystemUI/res/values-ko-xlarge/strings.xml index 3777154..e28ac63 100644 --- a/packages/SystemUI/res/values-ko-xlarge/strings.xml +++ b/packages/SystemUI/res/values-ko-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi 연결됨"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"GPS 검색"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"GPS에서 설정한 위치"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"알림 사용 안함"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"알림을 다시 사용하려면 여기를 누르세요."</string> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 32ae7e7..440ebb6 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -34,7 +34,8 @@ <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_airplane" msgid="4879879698500955300">"비행기 모드"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"화면 방향 잠금"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"무시"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"자동"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"알림"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"블루투스 테더링됨"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"입력 방법 구성"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"물리적 키보드 사용"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-lt-xlarge/strings.xml b/packages/SystemUI/res/values-lt-xlarge/strings.xml index 90dd501..12e8bb3 100644 --- a/packages/SystemUI/res/values-lt-xlarge/strings.xml +++ b/packages/SystemUI/res/values-lt-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Prisijungta prie „Wi-Fi“"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Ieškoma GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"GPS nustatyta vieta"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Pranešimai išjungti"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Palieskite čia, kad vėl įjungtumėte pranešimus."</string> </resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 01cdffd..9bf5f74 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Nustatymai"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Lėktuvo režimas"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Užfiksuoti ekrano orientaciją"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"NUTILD."</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTOM."</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Pranešimai"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"„Bluetooth“ susieta"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Konfigūruoti įvesties metodus"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Naudoti fizinę klaviatūrą"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-lv-xlarge/strings.xml b/packages/SystemUI/res/values-lv-xlarge/strings.xml index c533ecb..aecb471 100644 --- a/packages/SystemUI/res/values-lv-xlarge/strings.xml +++ b/packages/SystemUI/res/values-lv-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Izv. sav. ar Wi-Fi"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Notiek GPS meklēšana..."</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"GPS iestatītā atrašanās vieta"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Paziņojumi ir izslēgti."</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Pieskarieties šeit, lai vēlreiz ieslēgtu paziņojumus."</string> </resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 817e1d5..5c14342 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Iestatījumi"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Lidmašīnas režīms"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Bloķēt ekrāna orientāciju"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"IZ. SK."</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTOM."</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Paziņojumi"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth piesaiste"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Konfigurēt ievades metodes"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Izmantot fizisku tastatūru"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-nb-xlarge/strings.xml b/packages/SystemUI/res/values-nb-xlarge/strings.xml index 2bf63e8..717ee79 100644 --- a/packages/SystemUI/res/values-nb-xlarge/strings.xml +++ b/packages/SystemUI/res/values-nb-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi: tilkoblet"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Søker etter GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Posisjon angitt av GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Varslinger er slått av"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Trykk her for å slå på varslinger igjen."</string> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index bb96483..1671dcf 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Innstillinger"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Trådløse nettverk"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Flymodus"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Lås skjermretning"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"DEMPET"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Varslinger"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth tilknyttet"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Konfigurer inndatametoder"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Bruk fysisk tastatur"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-nl-xlarge/strings.xml b/packages/SystemUI/res/values-nl-xlarge/strings.xml index 7a63401..7c84a7a 100644 --- a/packages/SystemUI/res/values-nl-xlarge/strings.xml +++ b/packages/SystemUI/res/values-nl-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Verbonden via Wi-Fi"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Zoeken naar GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Locatie bepaald met GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Meldingen uit"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Tik hier om meldingen weer in te schakelen."</string> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index faf3f32..ac3255f 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Instellingen"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Vliegmodus"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Schermstand vergrendelen"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"DEMPEN"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Meldingen"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth getetherd"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Invoermethoden configureren"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Fysiek toetsenbord gebruiken"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pl-xlarge/strings.xml b/packages/SystemUI/res/values-pl-xlarge/strings.xml index 1334b70..9db1cab 100644 --- a/packages/SystemUI/res/values-pl-xlarge/strings.xml +++ b/packages/SystemUI/res/values-pl-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi: połączono"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Wyszukiwanie sygnału GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Lokalizacja ustawiona wg GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Powiadomienia wyłączone"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Dotknij tutaj, aby z powrotem włączyć powiadomienia."</string> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 77ae7e7..1af9d68 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Ustawienia"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Tryb samolotowy"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Zablokuj orientację ekranu"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"WYGAŚ"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTOM."</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Powiadomienia"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth – podłączono"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Konfiguruj metody wprowadzania"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Używaj klawiatury fizycznej"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT-xlarge/strings.xml b/packages/SystemUI/res/values-pt-rPT-xlarge/strings.xml index a5d6bac..7860208 100644 --- a/packages/SystemUI/res/values-pt-rPT-xlarge/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi ligado"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"A procurar GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Localização definida por GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Notificações desativadas"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Toque aqui para voltar a ativar as notificações."</string> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 1215415..2f0e269 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Definições"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Modo de avião"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Bloquear orientação do ecrã"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"D. SOM"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notificações"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth ligado"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Configurar métodos de entrada"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Utilizar teclado físico"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt-xlarge/strings.xml b/packages/SystemUI/res/values-pt-xlarge/strings.xml index 5209ab9..2a1786d 100644 --- a/packages/SystemUI/res/values-pt-xlarge/strings.xml +++ b/packages/SystemUI/res/values-pt-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi conectado"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Procurando GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Localização definida por GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Notificações desativadas"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Toque aqui para ativar novamente as notificações."</string> </resources> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 1f4afb7..d9e68e8 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Configurações"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Modo para avião"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Bloquear orientação de tela"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"MUDO"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notificações"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth vinculado"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Configurar métodos de entrada"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Usar o teclado físico"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-rm/strings.xml b/packages/SystemUI/res/values-rm/strings.xml index d4d4600..aa35dd4 100644 --- a/packages/SystemUI/res/values-rm/strings.xml +++ b/packages/SystemUI/res/values-rm/strings.xml @@ -42,7 +42,7 @@ <skip /> <!-- no translation found for status_bar_settings_airplane (4879879698500955300) --> <skip /> - <!-- no translation found for status_bar_settings_rotation_lock (8361452930058000609) --> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> <skip /> <!-- no translation found for status_bar_settings_mute_label (554682549917429396) --> <skip /> @@ -61,4 +61,20 @@ <skip /> <!-- no translation found for status_bar_use_physical_keyboard (3695516942412442936) --> <skip /> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ro-xlarge/strings.xml b/packages/SystemUI/res/values-ro-xlarge/strings.xml index 2dedd3b..21fd0ad 100644 --- a/packages/SystemUI/res/values-ro-xlarge/strings.xml +++ b/packages/SystemUI/res/values-ro-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi conectat"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Se caută dispozitivul GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Locaţie setată prin GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Notificările sunt dezactivate"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Apăsaţi aici pentru a reactiva notificările."</string> </resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index c3bcc97..4c14b7d 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Setări"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Mod Avion"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Blocaţi orientarea ecranului"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"DEZAC."</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTOM."</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notificări"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Conectat prin tethering prin Bluetooth"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Configuraţi metode de intrare"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Utilizaţi tastat. fizică"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ru-xlarge/strings.xml b/packages/SystemUI/res/values-ru-xlarge/strings.xml index 212fa83..bc31fb1 100644 --- a/packages/SystemUI/res/values-ru-xlarge/strings.xml +++ b/packages/SystemUI/res/values-ru-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi подкл."</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Выполняется поиск при помощи GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Местоположение установлено при помощи GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Показ уведомлений отключен"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Нажмите здесь, чтобы снова включить показ уведомлений."</string> </resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index e53fbd2..2e2de6e 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -34,7 +34,8 @@ <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_airplane" msgid="4879879698500955300">"Режим полета"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Закрепить ориентацию экрана"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"ВЫКЛ."</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"АВТО"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Уведомления"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Общий модем доступен через Bluetooth"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Настроить способ ввода"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Использовать физическую клавиатуру"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sk-xlarge/strings.xml b/packages/SystemUI/res/values-sk-xlarge/strings.xml index 0fcdd4a..ee9e613 100644 --- a/packages/SystemUI/res/values-sk-xlarge/strings.xml +++ b/packages/SystemUI/res/values-sk-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi: pripojené"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Hľadanie signálu GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Poloha určená pomocou GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Upozornenia sú vypnuté"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Klepnutím tu upozornenia znova povolíte."</string> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index bf316cc..12d40ae 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Nastavenia"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Režim V lietadle"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Uzamknúť orientáciu obrazovky"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"STLMIŤ"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Upozornenia"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Zdieľané dátové pripojenie cez Bluetooth"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Konfigurovať metódy vstupu"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Použiť fyzickú klávesnicu"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sl-xlarge/strings.xml b/packages/SystemUI/res/values-sl-xlarge/strings.xml index 615c565..57ed9a7 100644 --- a/packages/SystemUI/res/values-sl-xlarge/strings.xml +++ b/packages/SystemUI/res/values-sl-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi – povezano"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Iskanje GPS-a"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Lokacija nastavljena z GPS-om"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Obvestila izklopljena"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Tapnite tukaj, da spet vklopite obvestila."</string> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index c0a7f04..62d946a 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Nastavitve"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Način za letalo"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Zakleni usmerjenost zaslona"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"TIHO"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"SAMOD."</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Obvestila"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Internetna povezava prek Bluetootha"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Nastavitev načinov vnosa"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Uporabi fizično tipkovn."</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sr-xlarge/strings.xml b/packages/SystemUI/res/values-sr-xlarge/strings.xml index d66765b..95fbc2f 100644 --- a/packages/SystemUI/res/values-sr-xlarge/strings.xml +++ b/packages/SystemUI/res/values-sr-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi је повезан"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Тражи се GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Локацију је подесио GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Обавештења су искључена"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Додирните овде да бисте поново укључили обавештења."</string> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index bd00a9c..e319132 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -34,7 +34,8 @@ <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_airplane" msgid="4879879698500955300">"Режим рада у авиону"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Закључавање положаја екрана"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"УГАСИ"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"АУТОM."</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Обавештења"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Веза преко Bluetooth-а"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Конфигуриши методе уноса"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Користи физичку тастатуру"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sv-xlarge/strings.xml b/packages/SystemUI/res/values-sv-xlarge/strings.xml index b53269e..ce608c2 100644 --- a/packages/SystemUI/res/values-sv-xlarge/strings.xml +++ b/packages/SystemUI/res/values-sv-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi-ansluten"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Sökning efter GPS pågår"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Platsen har identifierats av GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Aviseringar inaktiverade"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Knacka lätt här om du vill aktivera aviseringar igen."</string> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 3d8f3c9..ba9f55e 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Inställningar"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Flygplansläge"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Lås bildskärmens riktning"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"TYST"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Aviseringar"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Internetdelning via Bluetooth"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Konfigurera inmatningsmetoder"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Använd fysiska tangenter"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-th-xlarge/strings.xml b/packages/SystemUI/res/values-th-xlarge/strings.xml index 8222140..824de38 100644 --- a/packages/SystemUI/res/values-th-xlarge/strings.xml +++ b/packages/SystemUI/res/values-th-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"เชื่อมต่อ Wi-Fi แล้ว"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"การค้นหาสำหรับ GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"ตำแหน่งที่กำหนดโดย GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"การแจ้งเตือนปิดอยู่"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"แตะที่นี่เพื่อเปิดการแจ้งเตือนอีกครั้ง"</string> </resources> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index c42e26d..192fe2c 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -34,7 +34,8 @@ <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_airplane" msgid="4879879698500955300">"โหมดใช้งานบนเครื่องบิน"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"ล็อกแนวหน้าจอ"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"ปิดเสียง"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"อัตโนมัติ"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"การแจ้งเตือน"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"บลูทูธที่ปล่อยสัญญาณ"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"กำหนดค่าวิธีการป้อนข้อมูล"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"ใช้แป้นพิมพ์จริง"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-tl-xlarge/strings.xml b/packages/SystemUI/res/values-tl-xlarge/strings.xml index 0eef090..582adbc 100644 --- a/packages/SystemUI/res/values-tl-xlarge/strings.xml +++ b/packages/SystemUI/res/values-tl-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Konektado ang WiFi"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Naghahanap ng GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Lokasyon na itinatakda ng GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Naka-off ang mga notification"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Mag-tap dito upang i-on muli ang mga notification."</string> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 1244945..a99014d 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Mga Setting"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Airplane mode"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Naka-lock na screen orientation"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"MUTE"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Mga Notification"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Na-tether ang bluetooth"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"I-configure paraan ng input"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Gamitin ang pisikal na keyboard"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-tr-xlarge/strings.xml b/packages/SystemUI/res/values-tr-xlarge/strings.xml index 8c382fb..6db515f 100644 --- a/packages/SystemUI/res/values-tr-xlarge/strings.xml +++ b/packages/SystemUI/res/values-tr-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Kablosuz bağlandı"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"GPS aranıyor"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Konum GPS ile belirlendi"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Bildirimler kapalı"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Bildirimleri tekrar açmak için buraya hafifçe vurun."</string> </resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index e911b42..2019a38 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Ayarlar"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Kablosuz"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Uçak modu"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Ekran yönünü kilitle"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"KAPAT"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"OTOMTK"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Bildirimler"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth paylaşımı tamam"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Giriş yöntemlerini yapılandır"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Fiziksel klavyeyi kullan"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-uk-xlarge/strings.xml b/packages/SystemUI/res/values-uk-xlarge/strings.xml index 6b1b193..81e50c0 100644 --- a/packages/SystemUI/res/values-uk-xlarge/strings.xml +++ b/packages/SystemUI/res/values-uk-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi під\'єднано"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Виконується пошук за допомогою GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Місцезнаходження встановлено за допомогою GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Сповіщення вимкнено"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Торкніться тут, щоб знову ввімкнути сповіщення."</string> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 963a50f..999ea9a 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -34,7 +34,8 @@ <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_airplane" msgid="4879879698500955300">"Режим польоту"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Заблокувати орієнтацію екрана"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"ІГНОР."</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"АВТОМ."</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Сповіщення"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Створено прив\'язку Bluetooth"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Налаштувати методи введення"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Викор. реальну клавіатуру"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-vi-xlarge/strings.xml b/packages/SystemUI/res/values-vi-xlarge/strings.xml index b44e1c3..6382fae 100644 --- a/packages/SystemUI/res/values-vi-xlarge/strings.xml +++ b/packages/SystemUI/res/values-vi-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Đã kết nối Wi-Fi"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"Tìm kiếm GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"Vị trí đặt bởi GPS"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"Tắt thông báo"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"Chạm vào đây để bật lại thông báo."</string> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 108febf..dd28680 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -34,7 +34,8 @@ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Cài đặt"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Chế độ trên máy bay"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Khóa hướng màn hình"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"TẮT TIẾNG"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"TỰ ĐỘNG"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"Thông báo"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth được dùng làm điểm truy cập Internet"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Định cấu hình phương pháp nhập liệu"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"Sử dụng bàn phím vật lý"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN-xlarge/strings.xml b/packages/SystemUI/res/values-zh-rCN-xlarge/strings.xml index f599dca..207ebe4 100644 --- a/packages/SystemUI/res/values-zh-rCN-xlarge/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi 已连接"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"正在搜索 GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"GPS 设置的位置"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"通知已关闭"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"点按此处可以重新打开通知。"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 5a74abc..d2a5578 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -34,7 +34,8 @@ <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_airplane" msgid="4879879698500955300">"飞行模式"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"锁定屏幕浏览模式"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"静音"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"自动"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"通知"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"蓝牙已绑定"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"配置输入法"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"使用物理键盘"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW-xlarge/strings.xml b/packages/SystemUI/res/values-zh-rTW-xlarge/strings.xml index 2191db7..14a10f2 100644 --- a/packages/SystemUI/res/values-zh-rTW-xlarge/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW-xlarge/strings.xml @@ -24,8 +24,6 @@ <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi 已連線"</string> <string name="gps_notification_searching_text" msgid="894185519046488403">"正在搜尋 GPS"</string> <string name="gps_notification_found_text" msgid="5306445324124275852">"GPS 已定位"</string> - <!-- no translation found for notifications_off_title (2297252328026582111) --> - <skip /> - <!-- no translation found for notifications_off_text (3754847213329718358) --> - <skip /> + <string name="notifications_off_title" msgid="2297252328026582111">"關閉通知"</string> + <string name="notifications_off_text" msgid="3754847213329718358">"輕觸這裡即可重新開啟通知。"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 7509357..f165bee 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -34,7 +34,8 @@ <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_airplane" msgid="4879879698500955300">"飛行模式"</string> - <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"鎖定螢幕瀏覽模式"</string> + <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) --> + <skip /> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"關閉"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"自動"</string> <string name="status_bar_settings_notifications" msgid="397146176280905137">"通知"</string> @@ -44,4 +45,20 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"已透過藍牙進行網際網路共用"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"設定輸入方式"</string> <string name="status_bar_use_physical_keyboard" msgid="3695516942412442936">"使用實體鍵盤"</string> + <!-- no translation found for usb_device_permission_prompt (5340926456453429244) --> + <skip /> + <!-- no translation found for usb_accessory_permission_prompt (3969745913539898765) --> + <skip /> + <!-- no translation found for usb_device_confirm_prompt (2727793581411868504) --> + <skip /> + <!-- no translation found for usb_accessory_confirm_prompt (3947430407252730383) --> + <skip /> + <!-- no translation found for usb_accessory_uri_prompt (1896291816269399727) --> + <skip /> + <!-- no translation found for title_usb_accessory (4966265263465181372) --> + <skip /> + <!-- no translation found for label_view (6304565553218192990) --> + <skip /> + <!-- no translation found for label_ignore (5473234388203739668) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 8998674..b4eea6e 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -129,7 +129,7 @@ <string name="usb_accessory_confirm_prompt">Open %1$s when this USB accessory is connected?</string> <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] --> - <string name="usb_accessory_uri_prompt">Additional information for this device may be found at: %1$s</string> + <string name="usb_accessory_uri_prompt">Additional information for this USB accessory may be found at: %1$s</string> <!-- Title for USB accessory dialog. Used when the name of the accessory cannot be determined. [CHAR LIMIT=50] --> <string name="title_usb_accessory">USB accessory</string> @@ -137,7 +137,10 @@ <!-- View button label for USB dialogs. [CHAR LIMIT=15] --> <string name="label_view">View</string> - <!-- Ignore button label for USB dialogs. [CHAR LIMIT=15] --> - <string name="label_ignore">Ignore</string> + <!-- Checkbox label for USB device dialogs. [CHAR LIMIT=50] --> + <string name="always_use_device">Use by default for this USB device</string> + + <!-- Checkbox label for USB accessory dialogs. [CHAR LIMIT=50] --> + <string name="always_use_accessory">Use by default for this USB accessory</string> </resources> diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbAccessoryUriActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbAccessoryUriActivity.java index eefb1c6..5007cf4 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbAccessoryUriActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbAccessoryUriActivity.java @@ -76,7 +76,7 @@ public class UsbAccessoryUriActivity extends AlertActivity } ap.mMessage = getString(R.string.usb_accessory_uri_prompt, mUri); ap.mPositiveButtonText = getString(R.string.label_view); - ap.mNegativeButtonText = getString(R.string.label_ignore); + ap.mNegativeButtonText = getString(android.R.string.cancel); ap.mPositiveButtonListener = this; ap.mNegativeButtonListener = this; diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java index 4e6f81f..030a261 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java @@ -80,8 +80,8 @@ public class UsbConfirmActivity extends AlertActivity ap.mMessage = getString(R.string.usb_device_confirm_prompt, appName); mDisconnectedReceiver = new UsbDisconnectedReceiver(this, mDevice); } - ap.mPositiveButtonText = getString(com.android.internal.R.string.ok); - ap.mNegativeButtonText = getString(com.android.internal.R.string.cancel); + ap.mPositiveButtonText = getString(android.R.string.ok); + ap.mNegativeButtonText = getString(android.R.string.cancel); ap.mPositiveButtonListener = this; ap.mNegativeButtonListener = this; @@ -90,7 +90,11 @@ public class UsbConfirmActivity extends AlertActivity Context.LAYOUT_INFLATER_SERVICE); ap.mView = inflater.inflate(com.android.internal.R.layout.always_use_checkbox, null); mAlwaysUse = (CheckBox)ap.mView.findViewById(com.android.internal.R.id.alwaysUse); - mAlwaysUse.setText(com.android.internal.R.string.alwaysUse); + if (mDevice == null) { + mAlwaysUse.setText(R.string.always_use_accessory); + } else { + mAlwaysUse.setText(R.string.always_use_device); + } mAlwaysUse.setOnCheckedChangeListener(this); mClearDefaultHint = (TextView)ap.mView.findViewById( com.android.internal.R.id.clearDefaultHint); @@ -100,6 +104,14 @@ public class UsbConfirmActivity extends AlertActivity } + @Override + protected void onDestroy() { + if (mDisconnectedReceiver != null) { + unregisterReceiver(mDisconnectedReceiver); + } + super.onDestroy(); + } + public void onClick(DialogInterface dialog, int which) { if (which == AlertDialog.BUTTON_POSITIVE) { try { diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbPermissionActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbPermissionActivity.java index 27cce6d..c384f50 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbPermissionActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbPermissionActivity.java @@ -91,8 +91,8 @@ public class UsbPermissionActivity extends AlertActivity ap.mMessage = getString(R.string.usb_device_permission_prompt, appName); mDisconnectedReceiver = new UsbDisconnectedReceiver(this, mDevice); } - ap.mPositiveButtonText = getString(com.android.internal.R.string.ok); - ap.mNegativeButtonText = getString(com.android.internal.R.string.cancel); + ap.mPositiveButtonText = getString(android.R.string.ok); + ap.mNegativeButtonText = getString(android.R.string.cancel); ap.mPositiveButtonListener = this; ap.mNegativeButtonListener = this; @@ -101,7 +101,11 @@ public class UsbPermissionActivity extends AlertActivity Context.LAYOUT_INFLATER_SERVICE); ap.mView = inflater.inflate(com.android.internal.R.layout.always_use_checkbox, null); mAlwaysUse = (CheckBox)ap.mView.findViewById(com.android.internal.R.id.alwaysUse); - mAlwaysUse.setText(com.android.internal.R.string.alwaysUse); + if (mDevice == null) { + mAlwaysUse.setText(R.string.always_use_accessory); + } else { + mAlwaysUse.setText(R.string.always_use_device); + } mAlwaysUse.setOnCheckedChangeListener(this); mClearDefaultHint = (TextView)ap.mView.findViewById( com.android.internal.R.id.clearDefaultHint); diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbResolverActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbResolverActivity.java index 7c63820..f61ecb1 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbResolverActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbResolverActivity.java @@ -31,6 +31,9 @@ import android.os.Parcelable; import android.os.RemoteException; import android.os.ServiceManager; import android.util.Log; +import android.widget.CheckBox; + +import com.android.systemui.R; import java.util.ArrayList; @@ -58,6 +61,15 @@ public class UsbResolverActivity extends ResolverActivity { super.onCreate(savedInstanceState, target, title, null, rList, true /* Set alwaysUseOption to true to enable "always use this app" checkbox. */ ); + CheckBox alwaysUse = (CheckBox)findViewById(com.android.internal.R.id.alwaysUse); + if (alwaysUse != null) { + if (mDevice == null) { + alwaysUse.setText(R.string.always_use_accessory); + } else { + alwaysUse.setText(R.string.always_use_device); + } + } + mDevice = (UsbDevice)target.getParcelableExtra(UsbManager.EXTRA_DEVICE); if (mDevice != null) { mDisconnectedReceiver = new UsbDisconnectedReceiver(this, mDevice); diff --git a/services/java/com/android/server/DeviceStorageMonitorService.java b/services/java/com/android/server/DeviceStorageMonitorService.java index 0fba7c3..b0d2158 100644 --- a/services/java/com/android/server/DeviceStorageMonitorService.java +++ b/services/java/com/android/server/DeviceStorageMonitorService.java @@ -398,4 +398,24 @@ class DeviceStorageMonitorService extends Binder { // force an early check postCheckMemoryMsg(true, 0); } + + /** + * Callable from other things in the system service to obtain the low memory + * threshold. + * + * @return low memory threshold in bytes + */ + public long getMemoryLowThreshold() { + return mMemLowThreshold; + } + + /** + * Callable from other things in the system process to check whether memory + * is low. + * + * @return true is memory is low + */ + public boolean isMemoryLow() { + return mLowMemFlag; + } } diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 9c9d406..1455764 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -60,7 +60,6 @@ import android.os.RemoteException; import android.os.ResultReceiver; import android.os.ServiceManager; import android.os.SystemClock; -import android.os.SystemProperties; import android.provider.Settings; import android.provider.Settings.Secure; import android.provider.Settings.SettingNotFoundException; @@ -315,7 +314,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub int mBackDisposition = InputMethodService.BACK_DISPOSITION_DEFAULT; int mImeWindowVis; - long mOldSystemSettingsVersion; AlertDialog.Builder mDialogBuilder; AlertDialog mSwitchingDialog; @@ -490,8 +488,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub handleMessage(msg); } }); - // Initialize the system settings version to undefined. - mOldSystemSettingsVersion = -1; (new MyPackageMonitor()).register(mContext, true); @@ -1012,15 +1008,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } } - // TODO: Investigate and fix why are settings changes getting processed before the settings seq - // number is updated? - // TODO: Change this stuff to not rely on modifying settings for normal user interactions. void updateFromSettingsLocked() { - long newSystemSettingsVersion = getSystemSettingsVersion(); - // This is a workaround to avoid a situation that old cached value in Settings.Secure - // will be handled. - if (newSystemSettingsVersion == mOldSystemSettingsVersion) return; - // We are assuming that whoever is changing DEFAULT_INPUT_METHOD and // ENABLED_INPUT_METHODS is taking care of keeping them correctly in // sync, so we will never have a DEFAULT_INPUT_METHOD that is not @@ -1989,7 +1977,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub private void setSelectedInputMethodAndSubtypeLocked(InputMethodInfo imi, int subtypeId, boolean setSubtypeOnly) { - mOldSystemSettingsVersion = getSystemSettingsVersion(); // Update the history of InputMethod and Subtype saveCurrentInputMethodAndSubtypeToHistory(); @@ -2239,10 +2226,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } } - private static long getSystemSettingsVersion() { - return SystemProperties.getLong(Settings.Secure.SYS_PROP_SETTING_VERSION, 0); - } - /** * @return Return the current subtype of this input method. */ diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java index 04f271d..3aebb5c 100644 --- a/services/java/com/android/server/PackageManagerService.java +++ b/services/java/com/android/server/PackageManagerService.java @@ -4919,12 +4919,24 @@ class PackageManagerService extends IPackageManager.Stub { Slog.w(TAG, "Cannot install fwd locked apps on sdcard"); ret = PackageManager.INSTALL_FAILED_INVALID_INSTALL_LOCATION; } else { + final long lowThreshold; + + final DeviceStorageMonitorService dsm = (DeviceStorageMonitorService) ServiceManager + .getService(DeviceStorageMonitorService.SERVICE); + if (dsm == null) { + Log.w(TAG, "Couldn't get low memory threshold; no free limit imposed"); + lowThreshold = 0L; + } else { + lowThreshold = dsm.getMemoryLowThreshold(); + } + // Remote call to find out default install location final PackageInfoLite pkgLite; try { mContext.grantUriPermission(DEFAULT_CONTAINER_PACKAGE, packageURI, Intent.FLAG_GRANT_READ_URI_PERMISSION); - pkgLite = mContainerService.getMinimalPackageInfo(packageURI, flags); + pkgLite = mContainerService.getMinimalPackageInfo(packageURI, flags, + lowThreshold); } finally { mContext.revokeUriPermission(packageURI, Intent.FLAG_GRANT_READ_URI_PERMISSION); } @@ -5144,10 +5156,26 @@ class PackageManagerService extends IPackageManager.Stub { } boolean checkFreeStorage(IMediaContainerService imcs) throws RemoteException { + final long lowThreshold; + + final DeviceStorageMonitorService dsm = (DeviceStorageMonitorService) ServiceManager + .getService(DeviceStorageMonitorService.SERVICE); + if (dsm == null) { + Log.w(TAG, "Couldn't get low memory threshold; no free limit imposed"); + lowThreshold = 0L; + } else { + if (dsm.isMemoryLow()) { + Log.w(TAG, "Memory is reported as being too low; aborting package install"); + return false; + } + + lowThreshold = dsm.getMemoryLowThreshold(); + } + try { mContext.grantUriPermission(DEFAULT_CONTAINER_PACKAGE, packageURI, Intent.FLAG_GRANT_READ_URI_PERMISSION); - return imcs.checkFreeStorage(false, packageURI); + return imcs.checkInternalFreeStorage(packageURI, lowThreshold); } finally { mContext.revokeUriPermission(packageURI, Intent.FLAG_GRANT_READ_URI_PERMISSION); } @@ -5373,7 +5401,7 @@ class PackageManagerService extends IPackageManager.Stub { try { mContext.grantUriPermission(DEFAULT_CONTAINER_PACKAGE, packageURI, Intent.FLAG_GRANT_READ_URI_PERMISSION); - return imcs.checkFreeStorage(true, packageURI); + return imcs.checkExternalFreeStorage(packageURI); } finally { mContext.revokeUriPermission(packageURI, Intent.FLAG_GRANT_READ_URI_PERMISSION); } diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 267c76a..50fffd0 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -6996,8 +6996,9 @@ public final class ActivityManagerService extends ActivityManagerNative addErrorToDropBox("wtf", r, null, null, tag, null, null, crashInfo); - if (Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.WTF_IS_FATAL, 0) != 0) { + if (r != null && r.pid != Process.myPid() && + Settings.Secure.getInt(mContext.getContentResolver(), + Settings.Secure.WTF_IS_FATAL, 0) != 0) { crashApplication(r, crashInfo); return true; } else { diff --git a/services/jni/com_android_server_UsbService.cpp b/services/jni/com_android_server_UsbService.cpp index c66f181..816f76f 100644 --- a/services/jni/com_android_server_UsbService.cpp +++ b/services/jni/com_android_server_UsbService.cpp @@ -193,13 +193,14 @@ static jobjectArray android_server_UsbService_getAccessoryStrings(JNIEnv *env, j return NULL; } jclass stringClass = env->FindClass("java/lang/String"); - jobjectArray strArray = env->NewObjectArray(5, stringClass, NULL); + jobjectArray strArray = env->NewObjectArray(6, stringClass, NULL); if (!strArray) goto out; set_accessory_string(env, fd, ACCESSORY_GET_STRING_MANUFACTURER, strArray, 0); set_accessory_string(env, fd, ACCESSORY_GET_STRING_MODEL, strArray, 1); set_accessory_string(env, fd, ACCESSORY_GET_STRING_DESCRIPTION, strArray, 2); set_accessory_string(env, fd, ACCESSORY_GET_STRING_VERSION, strArray, 3); set_accessory_string(env, fd, ACCESSORY_GET_STRING_URI, strArray, 4); + set_accessory_string(env, fd, ACCESSORY_GET_STRING_SERIAL, strArray, 5); out: close(fd); diff --git a/services/sensorservice/Android.mk b/services/sensorservice/Android.mk index 7e17fdd..c50e4a1 100644 --- a/services/sensorservice/Android.mk +++ b/services/sensorservice/Android.mk @@ -27,7 +27,7 @@ LOCAL_SHARED_LIBRARIES := \ libui \ libgui -LOCAL_PRELINK_MODULE := false + LOCAL_MODULE:= libsensorservice diff --git a/telephony/java/com/android/internal/telephony/ServiceStateTracker.java b/telephony/java/com/android/internal/telephony/ServiceStateTracker.java index 3905415..1b5bad9 100644 --- a/telephony/java/com/android/internal/telephony/ServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/ServiceStateTracker.java @@ -29,25 +29,6 @@ import android.telephony.SignalStrength; */ public abstract class ServiceStateTracker extends Handler { - /** - * Access technology currently in use. - */ - protected static final int DATA_ACCESS_UNKNOWN = 0; - protected static final int DATA_ACCESS_GPRS = 1; - protected static final int DATA_ACCESS_EDGE = 2; - protected static final int DATA_ACCESS_UMTS = 3; - protected static final int DATA_ACCESS_CDMA_IS95A = 4; - protected static final int DATA_ACCESS_CDMA_IS95B = 5; - protected static final int DATA_ACCESS_CDMA_1xRTT = 6; - protected static final int DATA_ACCESS_CDMA_EvDo_0 = 7; - protected static final int DATA_ACCESS_CDMA_EvDo_A = 8; - protected static final int DATA_ACCESS_HSDPA = 9; - protected static final int DATA_ACCESS_HSUPA = 10; - protected static final int DATA_ACCESS_HSPA = 11; - protected static final int DATA_ACCESS_CDMA_EvDo_B = 12; - protected static final int DATA_ACCESS_LTE = 13; - protected static final int DATA_ACCESS_EHRPD = 14; - protected CommandsInterface cm; public ServiceState ss; diff --git a/telephony/java/com/android/internal/telephony/cat/CatService.java b/telephony/java/com/android/internal/telephony/cat/CatService.java index 1e23e34..36059ad 100644 --- a/telephony/java/com/android/internal/telephony/cat/CatService.java +++ b/telephony/java/com/android/internal/telephony/cat/CatService.java @@ -118,6 +118,8 @@ public class CatService extends Handler implements AppInterface { private static IccRecords mIccRecords; // Service members. + // Protects singleton instance lazy initialization. + private static final Object sInstanceLock = new Object(); private static CatService sInstance; private CommandsInterface mCmdIf; private Context mContext; @@ -515,26 +517,28 @@ public class CatService extends Handler implements AppInterface { */ public static CatService getInstance(CommandsInterface ci, IccRecords ir, Context context, IccFileHandler fh, IccCard ic) { - if (sInstance == null) { - if (ci == null || ir == null || context == null || fh == null - || ic == null) { - return null; + synchronized (sInstanceLock) { + if (sInstance == null) { + if (ci == null || ir == null || context == null || fh == null + || ic == null) { + return null; + } + HandlerThread thread = new HandlerThread("Cat Telephony service"); + thread.start(); + sInstance = new CatService(ci, ir, context, fh, ic); + CatLog.d(sInstance, "NEW sInstance"); + } else if ((ir != null) && (mIccRecords != ir)) { + CatLog.d(sInstance, "Reinitialize the Service with SIMRecords"); + mIccRecords = ir; + + // re-Register for SIM ready event. + mIccRecords.registerForRecordsLoaded(sInstance, MSG_ID_ICC_RECORDS_LOADED, null); + CatLog.d(sInstance, "sr changed reinitialize and return current sInstance"); + } else { + CatLog.d(sInstance, "Return current sInstance"); } - HandlerThread thread = new HandlerThread("Cat Telephony service"); - thread.start(); - sInstance = new CatService(ci, ir, context, fh, ic); - CatLog.d(sInstance, "NEW sInstance"); - } else if ((ir != null) && (mIccRecords != ir)) { - CatLog.d(sInstance, "Reinitialize the Service with SIMRecords"); - mIccRecords = ir; - - // re-Register for SIM ready event. - mIccRecords.registerForRecordsLoaded(sInstance, MSG_ID_ICC_RECORDS_LOADED, null); - CatLog.d(sInstance, "sr changed reinitialize and return current sInstance"); - } else { - CatLog.d(sInstance, "Return current sInstance"); + return sInstance; } - return sInstance; } /** diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java index 386b636..40b5610 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java @@ -198,26 +198,26 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { String ret = "unknown"; switch (type) { - case DATA_ACCESS_CDMA_IS95A: - case DATA_ACCESS_CDMA_IS95B: + case ServiceState.RADIO_TECHNOLOGY_IS95A: + case ServiceState.RADIO_TECHNOLOGY_IS95B: ret = "CDMA"; break; - case DATA_ACCESS_CDMA_1xRTT: + case ServiceState.RADIO_TECHNOLOGY_1xRTT: ret = "CDMA - 1xRTT"; break; - case DATA_ACCESS_CDMA_EvDo_0: + case ServiceState.RADIO_TECHNOLOGY_EVDO_0: ret = "CDMA - EvDo rev. 0"; break; - case DATA_ACCESS_CDMA_EvDo_A: + case ServiceState.RADIO_TECHNOLOGY_EVDO_A: ret = "CDMA - EvDo rev. A"; break; - case DATA_ACCESS_CDMA_EvDo_B: + case ServiceState.RADIO_TECHNOLOGY_EVDO_B: ret = "CDMA - EvDo rev. B"; break; - case DATA_ACCESS_LTE: + case ServiceState.RADIO_TECHNOLOGY_LTE: ret = "LTE"; break; - case DATA_ACCESS_EHRPD: + case ServiceState.RADIO_TECHNOLOGY_EHRPD: ret = "CDMA - eHRPD"; default: if (DBG) { @@ -261,16 +261,20 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { boolean hasLocationChanged = !newCellLoc.equals(cellLoc); boolean has4gHandoff = - ((networkType == DATA_ACCESS_LTE) && (newNetworkType == DATA_ACCESS_EHRPD)) - || ((networkType == DATA_ACCESS_EHRPD) && (newNetworkType == DATA_ACCESS_LTE)); + ((networkType == ServiceState.RADIO_TECHNOLOGY_LTE) && + (newNetworkType == ServiceState.RADIO_TECHNOLOGY_EHRPD)) || + ((networkType == ServiceState.RADIO_TECHNOLOGY_EHRPD) && + (newNetworkType == ServiceState.RADIO_TECHNOLOGY_LTE)); boolean hasMultiApnSupport = - (((newNetworkType == DATA_ACCESS_LTE) || (newNetworkType == DATA_ACCESS_EHRPD)) - && ((networkType != DATA_ACCESS_LTE) && (networkType != DATA_ACCESS_EHRPD))); + (((newNetworkType == ServiceState.RADIO_TECHNOLOGY_LTE) || + (newNetworkType == ServiceState.RADIO_TECHNOLOGY_EHRPD)) && + ((networkType != ServiceState.RADIO_TECHNOLOGY_LTE) && + (networkType != ServiceState.RADIO_TECHNOLOGY_EHRPD))); boolean hasLostMultiApnSupport = - ((newNetworkType >= DATA_ACCESS_CDMA_IS95A) - && (newNetworkType <= DATA_ACCESS_CDMA_EvDo_A)); + ((newNetworkType >= ServiceState.RADIO_TECHNOLOGY_IS95A) && + (newNetworkType <= ServiceState.RADIO_TECHNOLOGY_EVDO_A)); log("hasRegistered = " + hasRegistered + " hasCdmaDataConnectionAttached = " + hasCdmaDataConnectionAttached + " hasCdmaDataConnectionChanged = " @@ -457,7 +461,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { // Note: it needs to be confirmed which CDMA network types // can support voice and data calls concurrently. // For the time-being, the return value will be false. - // return (networkType >= DATA_ACCESS_LTE); + // return (networkType >= ServiceState.RADIO_TECHNOLOGY_LTE); return false; } diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java index 6966345..4ab3834 100755 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java @@ -84,7 +84,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { NITZ_UPDATE_DIFF_DEFAULT); /** - * Values correspond to ServiceStateTracker.DATA_ACCESS_ definitions. + * Values correspond to ServiceState.RADIO_TECHNOLOGY_ definitions. */ protected int networkType = 0; protected int newNetworkType = 0; @@ -763,8 +763,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { return; } - if (err != CommandException.Error.OP_NOT_ALLOWED_BEFORE_REG_NW && - err != CommandException.Error.OP_NOT_ALLOWED_BEFORE_REG_NW) { + if (err != CommandException.Error.OP_NOT_ALLOWED_BEFORE_REG_NW) { Log.e(LOG_TAG, "RIL implementation has returned an error where it must succeed", ar.exception); @@ -912,20 +911,20 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { String ret = "unknown"; switch (type) { - case DATA_ACCESS_CDMA_IS95A: - case DATA_ACCESS_CDMA_IS95B: + case ServiceState.RADIO_TECHNOLOGY_IS95A: + case ServiceState.RADIO_TECHNOLOGY_IS95B: ret = "CDMA"; break; - case DATA_ACCESS_CDMA_1xRTT: + case ServiceState.RADIO_TECHNOLOGY_1xRTT: ret = "CDMA - 1xRTT"; break; - case DATA_ACCESS_CDMA_EvDo_0: + case ServiceState.RADIO_TECHNOLOGY_EVDO_0: ret = "CDMA - EvDo rev. 0"; break; - case DATA_ACCESS_CDMA_EvDo_A: + case ServiceState.RADIO_TECHNOLOGY_EVDO_A: ret = "CDMA - EvDo rev. A"; break; - case DATA_ACCESS_CDMA_EvDo_B: + case ServiceState.RADIO_TECHNOLOGY_EVDO_B: ret = "CDMA - EvDo rev. B"; break; default: diff --git a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java index 12644c8..7a45e15 100755 --- a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java +++ b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java @@ -585,7 +585,6 @@ public final class BearerData { uData.payload = new byte[0]; uData.numFields = 0; } else { - uData.payload = uData.payload; uData.numFields = uData.payload.length; } } else { diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java index 277980a..3f521a0 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java @@ -85,7 +85,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { private int mNewReasonDataDenied = -1; /** - * Values correspond to ServiceStateTracker.DATA_ACCESS_ definitions. + * Values correspond to ServiceState.RADIO_TECHNOLOGY_ definitions. */ private int networkType = 0; private int newNetworkType = 0; @@ -565,8 +565,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { return; } - if (err != CommandException.Error.OP_NOT_ALLOWED_BEFORE_REG_NW && - err != CommandException.Error.OP_NOT_ALLOWED_BEFORE_REG_NW) { + if (err != CommandException.Error.OP_NOT_ALLOWED_BEFORE_REG_NW) { Log.e(LOG_TAG, "RIL implementation has returned an error where it must succeed" + ar.exception); @@ -768,22 +767,22 @@ final class GsmServiceStateTracker extends ServiceStateTracker { String ret = "unknown"; switch (type) { - case DATA_ACCESS_GPRS: + case ServiceState.RADIO_TECHNOLOGY_GPRS: ret = "GPRS"; break; - case DATA_ACCESS_EDGE: + case ServiceState.RADIO_TECHNOLOGY_EDGE: ret = "EDGE"; break; - case DATA_ACCESS_UMTS: + case ServiceState.RADIO_TECHNOLOGY_UMTS: ret = "UMTS"; break; - case DATA_ACCESS_HSDPA: + case ServiceState.RADIO_TECHNOLOGY_HSDPA: ret = "HSDPA"; break; - case DATA_ACCESS_HSUPA: + case ServiceState.RADIO_TECHNOLOGY_HSUPA: ret = "HSUPA"; break; - case DATA_ACCESS_HSPA: + case ServiceState.RADIO_TECHNOLOGY_HSPA: ret = "HSPA"; break; default: @@ -1303,7 +1302,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { * that could support voice and data simultaneously. */ public boolean isConcurrentVoiceAndDataAllowed() { - return (networkType >= DATA_ACCESS_UMTS); + return (networkType >= ServiceState.RADIO_TECHNOLOGY_UMTS); } /** diff --git a/tests/BrowserTestPlugin/jni/Android.mk b/tests/BrowserTestPlugin/jni/Android.mk index 95a21e9..a0d647b 100644 --- a/tests/BrowserTestPlugin/jni/Android.mk +++ b/tests/BrowserTestPlugin/jni/Android.mk @@ -41,7 +41,7 @@ LOCAL_C_INCLUDES += \ external/webkit/WebKit/android/plugins LOCAL_CFLAGS += -fvisibility=hidden -LOCAL_PRELINK_MODULE := false + LOCAL_MODULE := libtestplugin LOCAL_MODULE_TAGS := tests diff --git a/tests/HwAccelerationTest/res/drawable/gradient.xml b/tests/HwAccelerationTest/res/drawable/gradient.xml new file mode 100644 index 0000000..756db0b --- /dev/null +++ b/tests/HwAccelerationTest/res/drawable/gradient.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- 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. +--> + +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <gradient + android:startColor="#FF707070" + android:endColor="#FF0C0C0C" + android:angle="270" /> +</shape> diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/GradientsActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/GradientsActivity.java index f8422f4..90db818 100644 --- a/tests/HwAccelerationTest/src/com/android/test/hwui/GradientsActivity.java +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/GradientsActivity.java @@ -193,6 +193,7 @@ public class GradientsActivity extends Activity { private final float mDrawWidth; private final float mDrawHeight; private final LinearGradient mGradient; + private final LinearGradient mGradientStops; private final Matrix mMatrix; ShadersView(Context c) { @@ -202,6 +203,9 @@ public class GradientsActivity extends Activity { mDrawHeight = 200; mGradient = new LinearGradient(0, 0, 0, 1, 0xFF000000, 0, Shader.TileMode.CLAMP); + mGradientStops = new LinearGradient(0, 0, 0, 1, + new int[] { 0xFFFF0000, 0xFF00FF00, 0xFF0000FF }, null, Shader.TileMode.CLAMP); + mMatrix = new Matrix(); mPaint = new Paint(); @@ -255,6 +259,19 @@ public class GradientsActivity extends Activity { mGradient.setLocalMatrix(mMatrix); canvas.drawRect(left, top, left + mDrawWidth, bottom, mPaint); + right = left + mDrawWidth; + left = 40.0f; + top = bottom + 20.0f; + bottom = top + 50.0f; + + mPaint.setShader(mGradientStops); + + mMatrix.setScale(1, mDrawWidth); + mMatrix.postRotate(90); + mMatrix.postTranslate(right, top); + mGradientStops.setLocalMatrix(mMatrix); + canvas.drawRect(left, top, right, bottom, mPaint); + canvas.restore(); } } diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/TransparentListActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/TransparentListActivity.java index 763169a..535f865 100644 --- a/tests/HwAccelerationTest/src/com/android/test/hwui/TransparentListActivity.java +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/TransparentListActivity.java @@ -79,7 +79,7 @@ public class TransparentListActivity extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getWindow().setBackgroundDrawable(getResources().getDrawable(R.drawable.default_wallpaper)); + getWindow().setBackgroundDrawable(getResources().getDrawable(R.drawable.gradient)); setContentView(R.layout.list_activity); ListAdapter adapter = new SimpleListAdapter(this); diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 5339566..10815a1 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -2607,6 +2607,9 @@ ResourceFilter::match(const ResTable_config& config) const if (!match(AXIS_SCREENSIZE, config.screenSize)) { return false; } + if (!match(AXIS_SCREENLAYOUTSIZE, config.screenLayout&ResTable_config::MASK_SCREENSIZE)) { + return false; + } if (!match(AXIS_VERSION, config.version)) { return false; } diff --git a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java index 88fd678..922cd4c 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java @@ -33,6 +33,7 @@ import java.awt.Rectangle; import java.awt.RenderingHints; import java.awt.Shape; import java.awt.geom.AffineTransform; +import java.awt.geom.Arc2D; import java.awt.image.BufferedImage; import java.util.List; @@ -290,7 +291,7 @@ public final class Canvas_Delegate { Paint paint) { draw(thisCanvas.mNativeCanvas, paint.mNativePaint, false /*compositeOnly*/, false /*forceSrcMode*/, new GcSnapshot.Drawable() { - public void draw(Graphics2D graphics, Paint_Delegate paint) { + public void draw(Graphics2D graphics, Paint_Delegate paintDelegate) { for (int i = 0 ; i < count ; i += 4) { graphics.drawLine((int)pts[i + offset], (int)pts[i + offset + 1], (int)pts[i + offset + 2], (int)pts[i + offset + 3]); @@ -314,12 +315,12 @@ public final class Canvas_Delegate { Canvas_Delegate newDelegate = new Canvas_Delegate(bitmapDelegate); return sManager.addNewDelegate(newDelegate); - } else { - // create a new Canvas_Delegate and return its new native int. - Canvas_Delegate newDelegate = new Canvas_Delegate(); - - return sManager.addNewDelegate(newDelegate); } + + // create a new Canvas_Delegate and return its new native int. + Canvas_Delegate newDelegate = new Canvas_Delegate(); + + return sManager.addNewDelegate(newDelegate); } @LayoutlibDelegate @@ -650,7 +651,7 @@ public final class Canvas_Delegate { draw(nativeCanvas, paint, false /*compositeOnly*/, false /*forceSrcMode*/, new GcSnapshot.Drawable() { - public void draw(Graphics2D graphics, Paint_Delegate paint) { + public void draw(Graphics2D graphics, Paint_Delegate paintDelegate) { graphics.drawLine((int)startX, (int)startY, (int)stopX, (int)stopY); } }); @@ -668,8 +669,8 @@ public final class Canvas_Delegate { draw(nativeCanvas, paint, false /*compositeOnly*/, false /*forceSrcMode*/, new GcSnapshot.Drawable() { - public void draw(Graphics2D graphics, Paint_Delegate paint) { - int style = paint.getStyle(); + public void draw(Graphics2D graphics, Paint_Delegate paintDelegate) { + int style = paintDelegate.getStyle(); // draw if (style == Paint.Style.FILL.nativeInt || @@ -692,8 +693,8 @@ public final class Canvas_Delegate { if (oval.right > oval.left && oval.bottom > oval.top) { draw(nativeCanvas, paint, false /*compositeOnly*/, false /*forceSrcMode*/, new GcSnapshot.Drawable() { - public void draw(Graphics2D graphics, Paint_Delegate paint) { - int style = paint.getStyle(); + public void draw(Graphics2D graphics, Paint_Delegate paintDelegate) { + int style = paintDelegate.getStyle(); // draw if (style == Paint.Style.FILL.nativeInt || @@ -722,10 +723,32 @@ public final class Canvas_Delegate { @LayoutlibDelegate /*package*/ static void native_drawArc(int nativeCanvas, - RectF oval, float startAngle, float sweep, boolean useCenter, int paint) { - // FIXME - Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED, - "Canvas.drawArc is not supported.", null, null /*data*/); + final RectF oval, final float startAngle, final float sweep, + final boolean useCenter, int paint) { + if (oval.right > oval.left && oval.bottom > oval.top) { + draw(nativeCanvas, paint, false /*compositeOnly*/, false /*forceSrcMode*/, + new GcSnapshot.Drawable() { + public void draw(Graphics2D graphics, Paint_Delegate paintDelegate) { + int style = paintDelegate.getStyle(); + + Arc2D.Float arc = new Arc2D.Float( + oval.left, oval.top, oval.width(), oval.height(), + -startAngle, -sweep, + useCenter ? Arc2D.PIE : Arc2D.OPEN); + + // draw + if (style == Paint.Style.FILL.nativeInt || + style == Paint.Style.FILL_AND_STROKE.nativeInt) { + graphics.fill(arc); + } + + if (style == Paint.Style.STROKE.nativeInt || + style == Paint.Style.FILL_AND_STROKE.nativeInt) { + graphics.draw(arc); + } + } + }); + } } @LayoutlibDelegate @@ -734,8 +757,8 @@ public final class Canvas_Delegate { draw(nativeCanvas, paint, false /*compositeOnly*/, false /*forceSrcMode*/, new GcSnapshot.Drawable() { - public void draw(Graphics2D graphics, Paint_Delegate paint) { - int style = paint.getStyle(); + public void draw(Graphics2D graphics, Paint_Delegate paintDelegate) { + int style = paintDelegate.getStyle(); // draw if (style == Paint.Style.FILL.nativeInt || @@ -766,9 +789,9 @@ public final class Canvas_Delegate { draw(nativeCanvas, paint, false /*compositeOnly*/, false /*forceSrcMode*/, new GcSnapshot.Drawable() { - public void draw(Graphics2D graphics, Paint_Delegate paint) { + public void draw(Graphics2D graphics, Paint_Delegate paintDelegate) { Shape shape = pathDelegate.getJavaShape(); - int style = paint.getStyle(); + int style = paintDelegate.getStyle(); if (style == Paint.Style.FILL.nativeInt || style == Paint.Style.FILL_AND_STROKE.nativeInt) { @@ -947,23 +970,23 @@ public final class Canvas_Delegate { final float startX, final float startY, int flags, int paint) { draw(nativeCanvas, paint, false /*compositeOnly*/, false /*forceSrcMode*/, new GcSnapshot.Drawable() { - public void draw(Graphics2D graphics, Paint_Delegate paint) { + public void draw(Graphics2D graphics, Paint_Delegate paintDelegate) { // WARNING: the logic in this method is similar to Paint_Delegate.measureText. // Any change to this method should be reflected in Paint.measureText // Paint.TextAlign indicates how the text is positioned relative to X. // LEFT is the default and there's nothing to do. float x = startX; float y = startY; - if (paint.getTextAlign() != Paint.Align.LEFT.nativeInt) { - float m = paint.measureText(text, index, count); - if (paint.getTextAlign() == Paint.Align.CENTER.nativeInt) { + if (paintDelegate.getTextAlign() != Paint.Align.LEFT.nativeInt) { + float m = paintDelegate.measureText(text, index, count); + if (paintDelegate.getTextAlign() == Paint.Align.CENTER.nativeInt) { x -= m / 2; - } else if (paint.getTextAlign() == Paint.Align.RIGHT.nativeInt) { + } else if (paintDelegate.getTextAlign() == Paint.Align.RIGHT.nativeInt) { x -= m; } } - List<FontInfo> fonts = paint.getFonts(); + List<FontInfo> fonts = paintDelegate.getFonts(); if (fonts.size() > 0) { FontInfo mainFont = fonts.get(0); diff --git a/tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java index db14e53..64f19d3 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java @@ -365,7 +365,7 @@ public final class Path_Delegate { // because x/y is the center of the circle, need to offset this by the radius pathDelegate.mPath.append(new Arc2D.Float( oval.left, oval.top, oval.width(), oval.height(), - startAngle, sweepAngle, Arc2D.OPEN), false); + -startAngle, -sweepAngle, Arc2D.OPEN), false); } @LayoutlibDelegate @@ -707,10 +707,9 @@ public final class Path_Delegate { * mod 360. * @param forceMoveTo If true, always begin a new contour with the arc */ - private void arcTo(RectF oval, float startAngle, float sweepAngle, - boolean forceMoveTo) { - Arc2D arc = new Arc2D.Float(oval.left, oval.top, oval.width(), oval.height(), startAngle, - sweepAngle, Arc2D.OPEN); + private void arcTo(RectF oval, float startAngle, float sweepAngle, boolean forceMoveTo) { + Arc2D arc = new Arc2D.Float(oval.left, oval.top, oval.width(), oval.height(), -startAngle, + -sweepAngle, Arc2D.OPEN); mPath.append(arc, true /*connect*/); resetLastPointFromPath(); diff --git a/voip/jni/rtp/Android.mk b/voip/jni/rtp/Android.mk index 76c43ba..61680a2 100644 --- a/voip/jni/rtp/Android.mk +++ b/voip/jni/rtp/Android.mk @@ -53,6 +53,6 @@ LOCAL_C_INCLUDES += \ LOCAL_CFLAGS += -fvisibility=hidden -LOCAL_PRELINK_MODULE := false + include $(BUILD_SHARED_LIBRARY) |
