Merge "SyncManager on JobScheduler"
diff --git a/Android.mk b/Android.mk
index 5983b30..ad164e20 100644
--- a/Android.mk
+++ b/Android.mk
@@ -187,6 +187,8 @@
core/java/android/hardware/location/IGeofenceHardware.aidl \
core/java/android/hardware/location/IGeofenceHardwareCallback.aidl \
core/java/android/hardware/location/IGeofenceHardwareMonitorCallback.aidl \
+ core/java/android/hardware/location/IContextHubCallback.aidl \
+ core/java/android/hardware/location/IContextHubService.aidl \
core/java/android/hardware/soundtrigger/IRecognitionStatusCallback.aidl \
core/java/android/hardware/usb/IUsbManager.aidl \
core/java/android/net/ICaptivePortal.aidl \
@@ -417,6 +419,7 @@
telephony/java/com/android/internal/telephony/ISub.aidl \
telephony/java/com/android/internal/telephony/ITelephony.aidl \
telephony/java/com/android/internal/telephony/ITelephonyDebug.aidl \
+ telephony/java/com/android/internal/telephony/ITelephonyDebugSubscriber.aidl \
telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
wifi/java/android/net/wifi/IWifiManager.aidl \
diff --git a/api/current.txt b/api/current.txt
index 5681438..f560053 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -437,7 +437,9 @@
field public static final deprecated int dayOfWeekBackground = 16843924; // 0x1010494
field public static final deprecated int dayOfWeekTextAppearance = 16843925; // 0x1010495
field public static final int debuggable = 16842767; // 0x101000f
+ field public static final int defaultHeight = 16844021; // 0x10104f5
field public static final int defaultValue = 16843245; // 0x10101ed
+ field public static final int defaultWidth = 16844020; // 0x10104f4
field public static final int delay = 16843212; // 0x10101cc
field public static final int dependency = 16843244; // 0x10101ec
field public static final int descendantFocusability = 16842993; // 0x10100f1
@@ -680,10 +682,8 @@
field public static final int indicatorStart = 16843729; // 0x10103d1
field public static final int inflatedId = 16842995; // 0x10100f3
field public static final int initOrder = 16842778; // 0x101001a
- field public static final int initialHeight = 16844021; // 0x10104f5
field public static final int initialKeyguardLayout = 16843714; // 0x10103c2
field public static final int initialLayout = 16843345; // 0x1010251
- field public static final int initialWidth = 16844020; // 0x10104f4
field public static final int innerRadius = 16843359; // 0x101025f
field public static final int innerRadiusRatio = 16843163; // 0x101019b
field public static final deprecated int inputMethod = 16843112; // 0x1010168
@@ -2625,6 +2625,7 @@
method public final android.accessibilityservice.AccessibilityService.MagnificationController getMagnificationController();
method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow();
method public final android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();
+ method public final android.accessibilityservice.AccessibilityService.SoftKeyboardController getSoftKeyboardController();
method public java.util.List<android.view.accessibility.AccessibilityWindowInfo> getWindows();
method public abstract void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
method public final android.os.IBinder onBind(android.content.Intent);
@@ -2683,6 +2684,18 @@
method public abstract void onMagnificationChanged(android.accessibilityservice.AccessibilityService.MagnificationController, android.graphics.Region, float, float, float);
}
+ public static final class AccessibilityService.SoftKeyboardController {
+ method public void addOnShowModeChangedListener(android.accessibilityservice.AccessibilityService.SoftKeyboardController.OnShowModeChangedListener);
+ method public void addOnShowModeChangedListener(android.accessibilityservice.AccessibilityService.SoftKeyboardController.OnShowModeChangedListener, android.os.Handler);
+ method public int getShowMode();
+ method public boolean removeOnShowModeChangedListener(android.accessibilityservice.AccessibilityService.SoftKeyboardController.OnShowModeChangedListener);
+ method public boolean setShowMode(int);
+ }
+
+ public static abstract interface AccessibilityService.SoftKeyboardController.OnShowModeChangedListener {
+ method public abstract void onShowModeChanged(android.accessibilityservice.AccessibilityService.SoftKeyboardController, int);
+ }
+
public class AccessibilityServiceInfo implements android.os.Parcelable {
ctor public AccessibilityServiceInfo();
method public static java.lang.String capabilityToString(int);
@@ -3395,7 +3408,7 @@
method public boolean dispatchTouchEvent(android.view.MotionEvent);
method public boolean dispatchTrackballEvent(android.view.MotionEvent);
method public void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
- method public void enterPictureInPictureMode();
+ method public void enterPictureInPicture();
method public android.view.View findViewById(int);
method public void finish();
method public void finishActivity(int);
@@ -3435,8 +3448,8 @@
method public android.view.Window getWindow();
method public android.view.WindowManager getWindowManager();
method public boolean hasWindowFocus();
- method public boolean inMultiWindowMode();
- method public boolean inPictureInPictureMode();
+ method public boolean inMultiWindow();
+ method public boolean inPictureInPicture();
method public void invalidateOptionsMenu();
method public boolean isChangingConfigurations();
method public final boolean isChild();
@@ -3490,7 +3503,7 @@
method public void onLowMemory();
method public boolean onMenuItemSelected(int, android.view.MenuItem);
method public boolean onMenuOpened(int, android.view.Menu);
- method public void onMultiWindowModeChanged(boolean);
+ method public void onMultiWindowChanged(boolean);
method public boolean onNavigateUp();
method public boolean onNavigateUpFromChild(android.app.Activity);
method protected void onNewIntent(android.content.Intent);
@@ -3498,7 +3511,7 @@
method public void onOptionsMenuClosed(android.view.Menu);
method public void onPanelClosed(int, android.view.Menu);
method protected void onPause();
- method public void onPictureInPictureModeChanged(boolean);
+ method public void onPictureInPictureChanged(boolean);
method protected void onPostCreate(android.os.Bundle);
method public void onPostCreate(android.os.Bundle, android.os.PersistableBundle);
method protected void onPostResume();
@@ -3821,7 +3834,6 @@
public class ActivityOptions {
method public android.graphics.Rect getLaunchBounds();
- method public boolean hasLaunchBounds();
method public static android.app.ActivityOptions makeBasic();
method public static android.app.ActivityOptions makeClipRevealAnimation(android.view.View, int, int, int, int);
method public static android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int);
@@ -4642,6 +4654,7 @@
method public android.content.Context getContext();
method public android.content.Context getTargetContext();
method public android.app.UiAutomation getUiAutomation();
+ method public android.app.UiAutomation getUiAutomation(int);
method public boolean invokeContextMenuAction(android.app.Activity, int, int);
method public boolean invokeMenuActionSync(android.app.Activity, int, int);
method public boolean isProfiling();
@@ -5538,6 +5551,7 @@
public final class UiAutomation {
method public void clearWindowAnimationFrameStats();
method public boolean clearWindowContentFrameStats(int);
+ method public void destroy();
method public android.view.accessibility.AccessibilityEvent executeAndWaitForEvent(java.lang.Runnable, android.app.UiAutomation.AccessibilityEventFilter, long) throws java.util.concurrent.TimeoutException;
method public android.os.ParcelFileDescriptor executeShellCommand(java.lang.String);
method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
@@ -5554,6 +5568,7 @@
method public final void setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo);
method public android.graphics.Bitmap takeScreenshot();
method public void waitForIdle(long, long) throws java.util.concurrent.TimeoutException;
+ field public static final int FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES = 1; // 0x1
field public static final int ROTATION_FREEZE_0 = 0; // 0x0
field public static final int ROTATION_FREEZE_180 = 2; // 0x2
field public static final int ROTATION_FREEZE_270 = 3; // 0x3
@@ -5768,6 +5783,7 @@
method public void onProfileProvisioningComplete(android.content.Context, android.content.Intent);
method public deprecated void onReadyForUserInitialization(android.content.Context, android.content.Intent);
method public void onReceive(android.content.Context, android.content.Intent);
+ method public void onSecurityLogsAvailable(android.content.Context, android.content.Intent);
method public void onSystemUpdatePending(android.content.Context, android.content.Intent, long);
field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLED = "android.app.action.DEVICE_ADMIN_DISABLED";
field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLE_REQUESTED = "android.app.action.DEVICE_ADMIN_DISABLE_REQUESTED";
@@ -5814,6 +5830,7 @@
method public boolean getCrossProfileContactsSearchDisabled(android.content.ComponentName);
method public java.util.List<java.lang.String> getCrossProfileWidgetProviders(android.content.ComponentName);
method public int getCurrentFailedPasswordAttempts();
+ method public boolean getDeviceLoggingEnabled(android.content.ComponentName);
method public java.lang.String getDeviceOwnerLockScreenInfo();
method public java.util.List<byte[]> getInstalledCaCerts(android.content.ComponentName);
method public int getKeyguardDisabledFeatures(android.content.ComponentName);
@@ -5821,6 +5838,7 @@
method public int getMaximumFailedPasswordsForWipe(android.content.ComponentName);
method public long getMaximumTimeToLock(android.content.ComponentName);
method public int getOrganizationColor(android.content.ComponentName);
+ method public java.lang.String getOrganizationName(android.content.ComponentName);
method public boolean getPackageSuspended(android.content.ComponentName, java.lang.String);
method public android.app.admin.DevicePolicyManager getParentProfileInstance(android.content.ComponentName);
method public long getPasswordExpiration(android.content.ComponentName);
@@ -5869,6 +5887,8 @@
method public boolean removeUser(android.content.ComponentName, android.os.UserHandle);
method public boolean requestBugreport(android.content.ComponentName);
method public boolean resetPassword(java.lang.String, int);
+ method public java.util.List<android.auditing.SecurityLog.SecurityEvent> retrieveDeviceLogs(android.content.ComponentName);
+ method public java.util.List<android.auditing.SecurityLog.SecurityEvent> retrievePreviousDeviceLogs(android.content.ComponentName);
method public void setAccountManagementDisabled(android.content.ComponentName, java.lang.String, boolean);
method public boolean setAlwaysOnVpnPackage(android.content.ComponentName, java.lang.String);
method public boolean setApplicationHidden(android.content.ComponentName, java.lang.String, boolean);
@@ -5880,6 +5900,7 @@
method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException;
method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);
method public void setCrossProfileContactsSearchDisabled(android.content.ComponentName, boolean);
+ method public void setDeviceLoggingEnabled(android.content.ComponentName, boolean);
method public boolean setDeviceOwnerLockScreenInfo(android.content.ComponentName, java.lang.String);
method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);
method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);
@@ -5890,6 +5911,7 @@
method public void setMaximumFailedPasswordsForWipe(android.content.ComponentName, int);
method public void setMaximumTimeToLock(android.content.ComponentName, long);
method public void setOrganizationColor(android.content.ComponentName, int);
+ method public void setOrganizationName(android.content.ComponentName, java.lang.String);
method public boolean setPackageSuspended(android.content.ComponentName, java.lang.String, boolean);
method public void setPasswordExpirationTimeout(android.content.ComponentName, long);
method public void setPasswordHistoryLength(android.content.ComponentName, int);
@@ -6301,7 +6323,6 @@
public static class NetworkStats.Bucket {
ctor public NetworkStats.Bucket();
method public long getEndTimeStamp();
- method public int getMetering();
method public int getRoaming();
method public long getRxBytes();
method public long getRxPackets();
@@ -6310,9 +6331,6 @@
method public long getTxBytes();
method public long getTxPackets();
method public int getUid();
- field public static final int METERING_ALL = -1; // 0xffffffff
- field public static final int METERING_DEFAULT = 1; // 0x1
- field public static final int METERING_METERED = 2; // 0x2
field public static final int ROAMING_ALL = -1; // 0xffffffff
field public static final int ROAMING_DEFAULT = 1; // 0x1
field public static final int ROAMING_ROAMING = 2; // 0x2
@@ -7922,6 +7940,7 @@
method public abstract java.lang.String[] databaseList();
method public abstract boolean deleteDatabase(java.lang.String);
method public abstract boolean deleteFile(java.lang.String);
+ method public abstract boolean deleteSharedPreferences(java.lang.String);
method public abstract void enforceCallingOrSelfPermission(java.lang.String, java.lang.String);
method public abstract void enforceCallingOrSelfUriPermission(android.net.Uri, int, java.lang.String);
method public abstract void enforceCallingPermission(java.lang.String, java.lang.String);
@@ -7974,6 +7993,8 @@
method public abstract void grantUriPermission(java.lang.String, android.net.Uri, int);
method public abstract boolean isDeviceEncryptedStorage();
method public boolean isRestricted();
+ method public abstract boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
+ method public abstract boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
method public final android.content.res.TypedArray obtainStyledAttributes(int[]);
method public final android.content.res.TypedArray obtainStyledAttributes(int, int[]) throws android.content.res.Resources.NotFoundException;
method public final android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[]);
@@ -8111,6 +8132,7 @@
method public java.lang.String[] databaseList();
method public boolean deleteDatabase(java.lang.String);
method public boolean deleteFile(java.lang.String);
+ method public boolean deleteSharedPreferences(java.lang.String);
method public void enforceCallingOrSelfPermission(java.lang.String, java.lang.String);
method public void enforceCallingOrSelfUriPermission(android.net.Uri, int, java.lang.String);
method public void enforceCallingPermission(java.lang.String, java.lang.String);
@@ -8156,6 +8178,8 @@
method public deprecated int getWallpaperDesiredMinimumWidth();
method public void grantUriPermission(java.lang.String, android.net.Uri, int);
method public boolean isDeviceEncryptedStorage();
+ method public boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
+ method public boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
method public java.io.FileInputStream openFileInput(java.lang.String) throws java.io.FileNotFoundException;
method public java.io.FileOutputStream openFileOutput(java.lang.String, int) throws java.io.FileNotFoundException;
method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory);
@@ -8627,7 +8651,7 @@
field public static final int FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS = 8388608; // 0x800000
field public static final int FLAG_ACTIVITY_FORWARD_RESULT = 33554432; // 0x2000000
field public static final int FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY = 1048576; // 0x100000
- field public static final int FLAG_ACTIVITY_LAUNCH_TO_SIDE = 4096; // 0x1000
+ field public static final int FLAG_ACTIVITY_LAUNCH_ADJACENT = 4096; // 0x1000
field public static final int FLAG_ACTIVITY_MULTIPLE_TASK = 134217728; // 0x8000000
field public static final int FLAG_ACTIVITY_NEW_DOCUMENT = 524288; // 0x80000
field public static final int FLAG_ACTIVITY_NEW_TASK = 268435456; // 0x10000000
@@ -19873,6 +19897,7 @@
method public android.media.AudioDeviceInfo getRoutedDevice();
method public int getSampleRate();
method public int getState();
+ method public int getTimestamp(android.media.AudioTimestamp, int);
method public int read(byte[], int, int);
method public int read(byte[], int, int, int);
method public int read(short[], int, int);
@@ -19944,6 +19969,8 @@
public final class AudioTimestamp {
ctor public AudioTimestamp();
+ field public static final int TIMEBASE_BOOTTIME = 1; // 0x1
+ field public static final int TIMEBASE_MONOTONIC = 0; // 0x0
field public long framePosition;
field public long nanoTime;
}
@@ -22498,6 +22525,7 @@
method public void setRatingType(int);
method public void setSessionActivity(android.app.PendingIntent);
field public static final int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1
+ field public static final int FLAG_HANDLES_PREPARE_ONLY = 4; // 0x4
field public static final int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2
}
@@ -22576,6 +22604,7 @@
field public static final long ACTION_SKIP_TO_QUEUE_ITEM = 4096L; // 0x1000L
field public static final long ACTION_STOP = 1L; // 0x1L
field public static final android.os.Parcelable.Creator<android.media.session.PlaybackState> CREATOR;
+ field public static final java.lang.String EXTRA_PREPARE_ONLY = "android.media.session.extra.PREPARE_ONLY";
field public static final long PLAYBACK_POSITION_UNKNOWN = -1L; // 0xffffffffffffffffL
field public static final int STATE_BUFFERING = 6; // 0x6
field public static final int STATE_CONNECTING = 8; // 0x8
@@ -22892,7 +22921,8 @@
method public void onInputAdded(java.lang.String);
method public void onInputRemoved(java.lang.String);
method public void onInputStateChanged(java.lang.String, int);
- method public void onTvInputInfoChanged(java.lang.String, android.media.tv.TvInputInfo);
+ method public void onInputUpdated(java.lang.String);
+ method public void onTvInputInfoChanged(android.media.tv.TvInputInfo);
}
public abstract class TvInputService extends android.app.Service {
@@ -22900,7 +22930,7 @@
method public final android.os.IBinder onBind(android.content.Intent);
method public android.media.tv.TvInputService.RecordingSession onCreateRecordingSession(java.lang.String);
method public abstract android.media.tv.TvInputService.Session onCreateSession(java.lang.String);
- method public final void setTvInputInfo(java.lang.String, android.media.tv.TvInputInfo);
+ method public static final void setTvInputInfo(android.content.Context, android.media.tv.TvInputInfo);
field public static final java.lang.String SERVICE_INTERFACE = "android.media.tv.TvInputService";
field public static final java.lang.String SERVICE_META_DATA = "android.media.tv.input";
}
@@ -22971,7 +23001,7 @@
method public void stopRecording();
}
- public class TvRecordingClient.RecordingCallback {
+ public static abstract class TvRecordingClient.RecordingCallback {
ctor public TvRecordingClient.RecordingCallback();
method public void onConnected();
method public void onDisconnected();
@@ -28538,6 +28568,10 @@
field public static final int OPEN = 32; // 0x20
}
+ public class FileUriExposedException extends java.lang.RuntimeException {
+ ctor public FileUriExposedException(java.lang.String);
+ }
+
public class Handler {
ctor public Handler();
ctor public Handler(android.os.Handler.Callback);
@@ -29129,6 +29163,7 @@
method public android.os.StrictMode.VmPolicy.Builder detectLeakedSqlLiteObjects();
method public android.os.StrictMode.VmPolicy.Builder penaltyDeath();
method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnCleartextNetwork();
+ method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnFileUriExposure();
method public android.os.StrictMode.VmPolicy.Builder penaltyDropBox();
method public android.os.StrictMode.VmPolicy.Builder penaltyLog();
method public android.os.StrictMode.VmPolicy.Builder setClassInstanceLimit(java.lang.Class, int);
@@ -29594,6 +29629,8 @@
method public static void setDefaultValues(android.content.Context, java.lang.String, int, int, boolean);
method public void setSharedPreferencesMode(int);
method public void setSharedPreferencesName(java.lang.String);
+ method public void setStorageDefault();
+ method public void setStorageDeviceEncrypted();
field public static final java.lang.String KEY_HAS_SET_DEFAULT_VALUES = "_has_set_default_values";
field public static final java.lang.String METADATA_KEY_PREFERENCES = "android.preference";
}
@@ -31642,6 +31679,7 @@
public abstract class DocumentsProvider extends android.content.ContentProvider {
ctor public DocumentsProvider();
+ method public java.lang.String copyDocument(java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public java.lang.String createDocument(java.lang.String, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public final int delete(android.net.Uri, java.lang.String, java.lang.String[]);
method public void deleteDocument(java.lang.String) throws java.io.FileNotFoundException;
@@ -31649,6 +31687,7 @@
method public final java.lang.String getType(android.net.Uri);
method public final android.net.Uri insert(android.net.Uri, android.content.ContentValues);
method public boolean isChildDocument(java.lang.String, java.lang.String);
+ method public java.lang.String moveDocument(java.lang.String, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public final android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
method public final android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
method public abstract android.os.ParcelFileDescriptor openDocument(java.lang.String, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
@@ -32044,6 +32083,7 @@
field public static final java.lang.String ACTION_INPUT_METHOD_SETTINGS = "android.settings.INPUT_METHOD_SETTINGS";
field public static final java.lang.String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS";
field public static final java.lang.String ACTION_INTERNAL_STORAGE_SETTINGS = "android.settings.INTERNAL_STORAGE_SETTINGS";
+ field public static final java.lang.String ACTION_KEYBOARD_LAYOUT_SETTINGS = "android.settings.KEYBOARD_LAYOUT_SETTINGS";
field public static final java.lang.String ACTION_LOCALE_SETTINGS = "android.settings.LOCALE_SETTINGS";
field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS";
field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";
@@ -37188,7 +37228,7 @@
method public void testActivityTestCaseSetUpProperly() throws java.lang.Exception;
}
- public abstract class ActivityInstrumentationTestCase2 extends android.test.ActivityTestCase {
+ public abstract deprecated class ActivityInstrumentationTestCase2 extends android.test.ActivityTestCase {
ctor public deprecated ActivityInstrumentationTestCase2(java.lang.String, java.lang.Class<T>);
ctor public ActivityInstrumentationTestCase2(java.lang.Class<T>);
method public T getActivity();
@@ -37196,14 +37236,14 @@
method public void setActivityIntent(android.content.Intent);
}
- public abstract class ActivityTestCase extends android.test.InstrumentationTestCase {
+ public abstract deprecated class ActivityTestCase extends android.test.InstrumentationTestCase {
ctor public ActivityTestCase();
method protected android.app.Activity getActivity();
method protected void scrubClass(java.lang.Class<?>) throws java.lang.IllegalAccessException;
method protected void setActivity(android.app.Activity);
}
- public abstract class ActivityUnitTestCase extends android.test.ActivityTestCase {
+ public abstract deprecated class ActivityUnitTestCase extends android.test.ActivityTestCase {
ctor public ActivityUnitTestCase(java.lang.Class<T>);
method public T getActivity();
method public int getFinishedActivityRequest();
@@ -37216,7 +37256,7 @@
method protected T startActivity(android.content.Intent, android.os.Bundle, java.lang.Object);
}
- public class AndroidTestCase extends junit.framework.TestCase {
+ public deprecated class AndroidTestCase extends junit.framework.TestCase {
ctor public AndroidTestCase();
method public void assertActivityRequiresPermission(java.lang.String, java.lang.String, java.lang.String);
method public void assertReadingContentUriRequiresPermission(android.net.Uri, java.lang.String);
@@ -37228,7 +37268,7 @@
field protected android.content.Context mContext;
}
- public class AndroidTestRunner extends junit.runner.BaseTestRunner {
+ public deprecated class AndroidTestRunner extends junit.runner.BaseTestRunner {
ctor public AndroidTestRunner();
method public void addTestListener(junit.framework.TestListener);
method public void clearTestListeners();
@@ -37249,7 +37289,7 @@
method public void testStarted(java.lang.String);
}
- public abstract class ApplicationTestCase extends android.test.AndroidTestCase {
+ public abstract deprecated class ApplicationTestCase extends android.test.AndroidTestCase {
ctor public ApplicationTestCase(java.lang.Class<T>);
method protected final void createApplication();
method public T getApplication();
@@ -37267,10 +37307,10 @@
ctor public ComparisonFailure(java.lang.String, java.lang.String, java.lang.String);
}
- public abstract class FlakyTest implements java.lang.annotation.Annotation {
+ public abstract deprecated class FlakyTest implements java.lang.annotation.Annotation {
}
- public class InstrumentationTestCase extends junit.framework.TestCase {
+ public deprecated class InstrumentationTestCase extends junit.framework.TestCase {
ctor public InstrumentationTestCase();
method public android.app.Instrumentation getInstrumentation();
method public deprecated void injectInsrumentation(android.app.Instrumentation);
@@ -37283,7 +37323,7 @@
method public void sendRepeatedKeys(int...);
}
- public class InstrumentationTestRunner extends android.app.Instrumentation implements android.test.TestSuiteProvider {
+ public deprecated class InstrumentationTestRunner extends android.app.Instrumentation implements android.test.TestSuiteProvider {
ctor public InstrumentationTestRunner();
method public junit.framework.TestSuite getAllTests();
method protected android.test.AndroidTestRunner getAndroidTestRunner();
@@ -37302,14 +37342,14 @@
field public static final int REPORT_VALUE_RESULT_START = 1; // 0x1
}
- public class InstrumentationTestSuite extends junit.framework.TestSuite {
+ public deprecated class InstrumentationTestSuite extends junit.framework.TestSuite {
ctor public InstrumentationTestSuite(android.app.Instrumentation);
ctor public InstrumentationTestSuite(java.lang.String, android.app.Instrumentation);
ctor public InstrumentationTestSuite(java.lang.Class, android.app.Instrumentation);
method public void addTestSuite(java.lang.Class);
}
- public class IsolatedContext extends android.content.ContextWrapper {
+ public deprecated class IsolatedContext extends android.content.ContextWrapper {
ctor public IsolatedContext(android.content.ContentResolver, android.content.Context);
method public java.util.List<android.content.Intent> getAndClearBroadcastIntents();
}
@@ -37319,7 +37359,7 @@
method public T getLoaderResultSynchronously(android.content.Loader<T>);
}
- public final class MoreAsserts {
+ public final deprecated class MoreAsserts {
method public static void assertAssignableFrom(java.lang.Class<?>, java.lang.Object);
method public static void assertAssignableFrom(java.lang.Class<?>, java.lang.Class<?>);
method public static java.util.regex.MatchResult assertContainsRegex(java.lang.String, java.lang.String, java.lang.String);
@@ -37358,7 +37398,7 @@
method public static void checkEqualsAndHashCodeMethods(java.lang.Object, java.lang.Object, boolean);
}
- public abstract interface PerformanceTestCase {
+ public abstract deprecated interface PerformanceTestCase {
method public abstract boolean isPerformanceOnly();
method public abstract int startPerformance(android.test.PerformanceTestCase.Intermediates);
}
@@ -37387,7 +37427,7 @@
method public static android.content.ContentResolver newResolverWithContentProviderFromSql(android.content.Context, java.lang.String, java.lang.Class<T>, java.lang.String, java.lang.String, int, java.lang.String) throws java.lang.IllegalAccessException, java.lang.InstantiationException;
}
- public class RenamingDelegatingContext extends android.content.ContextWrapper {
+ public deprecated class RenamingDelegatingContext extends android.content.ContextWrapper {
ctor public RenamingDelegatingContext(android.content.Context, java.lang.String);
ctor public RenamingDelegatingContext(android.content.Context, android.content.Context, java.lang.String);
method public java.lang.String getDatabasePrefix();
@@ -37396,7 +37436,7 @@
method public static T providerWithRenamedContext(java.lang.Class<T>, android.content.Context, java.lang.String, boolean) throws java.lang.IllegalAccessException, java.lang.InstantiationException;
}
- public abstract class ServiceTestCase extends android.test.AndroidTestCase {
+ public abstract deprecated class ServiceTestCase extends android.test.AndroidTestCase {
ctor public ServiceTestCase(java.lang.Class<T>);
method protected android.os.IBinder bindService(android.content.Intent);
method public android.app.Application getApplication();
@@ -37409,23 +37449,23 @@
method public void testServiceTestCaseSetUpProperly() throws java.lang.Exception;
}
- public abstract class SingleLaunchActivityTestCase extends android.test.InstrumentationTestCase {
+ public abstract deprecated class SingleLaunchActivityTestCase extends android.test.InstrumentationTestCase {
ctor public SingleLaunchActivityTestCase(java.lang.String, java.lang.Class<T>);
method public T getActivity();
method public void testActivityTestCaseSetUpProperly() throws java.lang.Exception;
}
- public class SyncBaseInstrumentation extends android.test.InstrumentationTestCase {
+ public deprecated class SyncBaseInstrumentation extends android.test.InstrumentationTestCase {
ctor public SyncBaseInstrumentation();
method protected void cancelSyncsandDisableAutoSync();
method protected void syncProvider(android.net.Uri, java.lang.String, java.lang.String) throws java.lang.Exception;
}
- public abstract interface TestSuiteProvider {
+ public abstract deprecated interface TestSuiteProvider {
method public abstract junit.framework.TestSuite getTestSuite();
}
- public class TouchUtils {
+ public deprecated class TouchUtils {
ctor public TouchUtils();
method public static void clickView(android.test.InstrumentationTestCase, android.view.View);
method public static deprecated void drag(android.test.ActivityInstrumentationTestCase, float, float, float, float, int);
@@ -37460,10 +37500,10 @@
method public static void touchAndCancelView(android.test.InstrumentationTestCase, android.view.View);
}
- public abstract class UiThreadTest implements java.lang.annotation.Annotation {
+ public abstract deprecated class UiThreadTest implements java.lang.annotation.Annotation {
}
- public class ViewAsserts {
+ public deprecated class ViewAsserts {
method public static void assertBaselineAligned(android.view.View, android.view.View);
method public static void assertBottomAligned(android.view.View, android.view.View);
method public static void assertBottomAligned(android.view.View, android.view.View, int);
@@ -37488,11 +37528,11 @@
package android.test.mock {
- public class MockApplication extends android.app.Application {
+ public deprecated class MockApplication extends android.app.Application {
ctor public MockApplication();
}
- public class MockContentProvider extends android.content.ContentProvider {
+ public deprecated class MockContentProvider extends android.content.ContentProvider {
ctor protected MockContentProvider();
ctor public MockContentProvider(android.content.Context);
ctor public MockContentProvider(android.content.Context, java.lang.String, java.lang.String, android.content.pm.PathPermission[]);
@@ -37504,13 +37544,13 @@
method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]);
}
- public class MockContentResolver extends android.content.ContentResolver {
+ public deprecated class MockContentResolver extends android.content.ContentResolver {
ctor public MockContentResolver();
ctor public MockContentResolver(android.content.Context);
method public void addProvider(java.lang.String, android.content.ContentProvider);
}
- public class MockContext extends android.content.Context {
+ public deprecated class MockContext extends android.content.Context {
ctor public MockContext();
method public boolean bindService(android.content.Intent, android.content.ServiceConnection, int);
method public int checkCallingOrSelfPermission(java.lang.String);
@@ -37529,6 +37569,7 @@
method public java.lang.String[] databaseList();
method public boolean deleteDatabase(java.lang.String);
method public boolean deleteFile(java.lang.String);
+ method public boolean deleteSharedPreferences(java.lang.String);
method public void enforceCallingOrSelfPermission(java.lang.String, java.lang.String);
method public void enforceCallingOrSelfUriPermission(android.net.Uri, int, java.lang.String);
method public void enforceCallingPermission(java.lang.String, java.lang.String);
@@ -37573,6 +37614,8 @@
method public int getWallpaperDesiredMinimumWidth();
method public void grantUriPermission(java.lang.String, android.net.Uri, int);
method public boolean isDeviceEncryptedStorage();
+ method public boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
+ method public boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
method public java.io.FileInputStream openFileInput(java.lang.String) throws java.io.FileNotFoundException;
method public java.io.FileOutputStream openFileOutput(java.lang.String, int) throws java.io.FileNotFoundException;
method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory);
@@ -37610,7 +37653,7 @@
method public void unregisterReceiver(android.content.BroadcastReceiver);
}
- public class MockCursor implements android.database.Cursor {
+ public deprecated class MockCursor implements android.database.Cursor {
ctor public MockCursor();
method public void close();
method public void copyStringToBuffer(int, android.database.CharArrayBuffer);
@@ -37655,13 +37698,13 @@
method public void unregisterDataSetObserver(android.database.DataSetObserver);
}
- public class MockDialogInterface implements android.content.DialogInterface {
+ public deprecated class MockDialogInterface implements android.content.DialogInterface {
ctor public MockDialogInterface();
method public void cancel();
method public void dismiss();
}
- public class MockPackageManager extends android.content.pm.PackageManager {
+ public deprecated class MockPackageManager extends android.content.pm.PackageManager {
ctor public MockPackageManager();
method public void addPackageToPreferred(java.lang.String);
method public boolean addPermission(android.content.pm.PermissionInfo);
@@ -37748,7 +37791,7 @@
method public void verifyPendingInstall(int, int);
}
- public class MockResources extends android.content.res.Resources {
+ public deprecated class MockResources extends android.content.res.Resources {
ctor public MockResources();
}
@@ -37789,19 +37832,19 @@
package android.test.suitebuilder.annotation {
- public abstract class LargeTest implements java.lang.annotation.Annotation {
+ public abstract deprecated class LargeTest implements java.lang.annotation.Annotation {
}
- public abstract class MediumTest implements java.lang.annotation.Annotation {
+ public abstract deprecated class MediumTest implements java.lang.annotation.Annotation {
}
- public abstract class SmallTest implements java.lang.annotation.Annotation {
+ public abstract deprecated class SmallTest implements java.lang.annotation.Annotation {
}
- public abstract class Smoke implements java.lang.annotation.Annotation {
+ public abstract deprecated class Smoke implements java.lang.annotation.Annotation {
}
- public abstract class Suppress implements java.lang.annotation.Annotation {
+ public abstract deprecated class Suppress implements java.lang.annotation.Annotation {
}
}
@@ -39855,6 +39898,7 @@
field public static final int DENSITY_420 = 420; // 0x1a4
field public static final int DENSITY_560 = 560; // 0x230
field public static final int DENSITY_DEFAULT = 160; // 0xa0
+ field public static final int DENSITY_DEVICE_STABLE;
field public static final int DENSITY_HIGH = 240; // 0xf0
field public static final int DENSITY_LOW = 120; // 0x78
field public static final int DENSITY_MEDIUM = 160; // 0xa0
@@ -51300,6 +51344,9 @@
public abstract class Inherited implements java.lang.annotation.Annotation {
}
+ public abstract class Repeatable implements java.lang.annotation.Annotation {
+ }
+
public abstract class Retention implements java.lang.annotation.Annotation {
}
@@ -61959,6 +62006,7 @@
ctor public ExtendedSSLSession();
method public abstract java.lang.String[] getLocalSupportedSignatureAlgorithms();
method public abstract java.lang.String[] getPeerSupportedSignatureAlgorithms();
+ method public java.util.List<javax.net.ssl.SNIServerName> getRequestedServerNames();
}
public class HandshakeCompletedEvent extends java.util.EventObject {
@@ -62031,6 +62079,25 @@
public abstract interface ManagerFactoryParameters {
}
+ public final class SNIHostName extends javax.net.ssl.SNIServerName {
+ ctor public SNIHostName(java.lang.String);
+ ctor public SNIHostName(byte[]);
+ method public static javax.net.ssl.SNIMatcher createSNIMatcher(java.lang.String);
+ method public java.lang.String getAsciiName();
+ }
+
+ public abstract class SNIMatcher {
+ ctor protected SNIMatcher(int);
+ method public final int getType();
+ method public abstract boolean matches(javax.net.ssl.SNIServerName);
+ }
+
+ public abstract class SNIServerName {
+ ctor protected SNIServerName(int, byte[]);
+ method public final byte[] getEncoded();
+ method public final int getType();
+ }
+
public class SSLContext {
ctor protected SSLContext(javax.net.ssl.SSLContextSpi, java.security.Provider, java.lang.String);
method public final javax.net.ssl.SSLEngine createSSLEngine();
@@ -62152,12 +62219,18 @@
method public java.lang.String getEndpointIdentificationAlgorithm();
method public boolean getNeedClientAuth();
method public java.lang.String[] getProtocols();
+ method public final java.util.Collection<javax.net.ssl.SNIMatcher> getSNIMatchers();
+ method public final java.util.List<javax.net.ssl.SNIServerName> getServerNames();
+ method public final boolean getUseCipherSuitesOrder();
method public boolean getWantClientAuth();
method public void setAlgorithmConstraints(java.security.AlgorithmConstraints);
method public void setCipherSuites(java.lang.String[]);
method public void setEndpointIdentificationAlgorithm(java.lang.String);
method public void setNeedClientAuth(boolean);
method public void setProtocols(java.lang.String[]);
+ method public final void setSNIMatchers(java.util.Collection<javax.net.ssl.SNIMatcher>);
+ method public final void setServerNames(java.util.List<javax.net.ssl.SNIServerName>);
+ method public final void setUseCipherSuitesOrder(boolean);
method public void setWantClientAuth(boolean);
}
@@ -62285,6 +62358,10 @@
method public abstract java.lang.String[] getSupportedCipherSuites();
}
+ public final class StandardConstants {
+ field public static final int SNI_HOST_NAME = 0; // 0x0
+ }
+
public abstract interface TrustManager {
}
diff --git a/api/removed.txt b/api/removed.txt
index 6b7961e..2c6729d 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -201,7 +201,7 @@
package android.test.mock {
- public class MockPackageManager extends android.content.pm.PackageManager {
+ public deprecated class MockPackageManager extends android.content.pm.PackageManager {
method public deprecated java.lang.String getDefaultBrowserPackageName(int);
method public deprecated boolean setDefaultBrowserPackageName(java.lang.String, int);
}
diff --git a/api/system-current.txt b/api/system-current.txt
index 63e3a21..d316bfa 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -532,7 +532,9 @@
field public static final deprecated int dayOfWeekBackground = 16843924; // 0x1010494
field public static final deprecated int dayOfWeekTextAppearance = 16843925; // 0x1010495
field public static final int debuggable = 16842767; // 0x101000f
+ field public static final int defaultHeight = 16844021; // 0x10104f5
field public static final int defaultValue = 16843245; // 0x10101ed
+ field public static final int defaultWidth = 16844020; // 0x10104f4
field public static final int delay = 16843212; // 0x10101cc
field public static final int dependency = 16843244; // 0x10101ec
field public static final int descendantFocusability = 16842993; // 0x10100f1
@@ -775,10 +777,8 @@
field public static final int indicatorStart = 16843729; // 0x10103d1
field public static final int inflatedId = 16842995; // 0x10100f3
field public static final int initOrder = 16842778; // 0x101001a
- field public static final int initialHeight = 16844021; // 0x10104f5
field public static final int initialKeyguardLayout = 16843714; // 0x10103c2
field public static final int initialLayout = 16843345; // 0x1010251
- field public static final int initialWidth = 16844020; // 0x10104f4
field public static final int innerRadius = 16843359; // 0x101025f
field public static final int innerRadiusRatio = 16843163; // 0x101019b
field public static final deprecated int inputMethod = 16843112; // 0x1010168
@@ -2727,6 +2727,7 @@
method public final android.accessibilityservice.AccessibilityService.MagnificationController getMagnificationController();
method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow();
method public final android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();
+ method public final android.accessibilityservice.AccessibilityService.SoftKeyboardController getSoftKeyboardController();
method public java.util.List<android.view.accessibility.AccessibilityWindowInfo> getWindows();
method public abstract void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
method public final android.os.IBinder onBind(android.content.Intent);
@@ -2785,6 +2786,18 @@
method public abstract void onMagnificationChanged(android.accessibilityservice.AccessibilityService.MagnificationController, android.graphics.Region, float, float, float);
}
+ public static final class AccessibilityService.SoftKeyboardController {
+ method public void addOnShowModeChangedListener(android.accessibilityservice.AccessibilityService.SoftKeyboardController.OnShowModeChangedListener);
+ method public void addOnShowModeChangedListener(android.accessibilityservice.AccessibilityService.SoftKeyboardController.OnShowModeChangedListener, android.os.Handler);
+ method public int getShowMode();
+ method public boolean removeOnShowModeChangedListener(android.accessibilityservice.AccessibilityService.SoftKeyboardController.OnShowModeChangedListener);
+ method public boolean setShowMode(int);
+ }
+
+ public static abstract interface AccessibilityService.SoftKeyboardController.OnShowModeChangedListener {
+ method public abstract void onShowModeChanged(android.accessibilityservice.AccessibilityService.SoftKeyboardController, int);
+ }
+
public class AccessibilityServiceInfo implements android.os.Parcelable {
ctor public AccessibilityServiceInfo();
method public static java.lang.String capabilityToString(int);
@@ -3510,7 +3523,7 @@
method public boolean dispatchTouchEvent(android.view.MotionEvent);
method public boolean dispatchTrackballEvent(android.view.MotionEvent);
method public void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
- method public void enterPictureInPictureMode();
+ method public void enterPictureInPicture();
method public android.view.View findViewById(int);
method public void finish();
method public void finishActivity(int);
@@ -3550,8 +3563,8 @@
method public android.view.Window getWindow();
method public android.view.WindowManager getWindowManager();
method public boolean hasWindowFocus();
- method public boolean inMultiWindowMode();
- method public boolean inPictureInPictureMode();
+ method public boolean inMultiWindow();
+ method public boolean inPictureInPicture();
method public void invalidateOptionsMenu();
method public boolean isBackgroundVisibleBehind();
method public boolean isChangingConfigurations();
@@ -3607,7 +3620,7 @@
method public void onLowMemory();
method public boolean onMenuItemSelected(int, android.view.MenuItem);
method public boolean onMenuOpened(int, android.view.Menu);
- method public void onMultiWindowModeChanged(boolean);
+ method public void onMultiWindowChanged(boolean);
method public boolean onNavigateUp();
method public boolean onNavigateUpFromChild(android.app.Activity);
method protected void onNewIntent(android.content.Intent);
@@ -3615,7 +3628,7 @@
method public void onOptionsMenuClosed(android.view.Menu);
method public void onPanelClosed(int, android.view.Menu);
method protected void onPause();
- method public void onPictureInPictureModeChanged(boolean);
+ method public void onPictureInPictureChanged(boolean);
method protected void onPostCreate(android.os.Bundle);
method public void onPostCreate(android.os.Bundle, android.os.PersistableBundle);
method protected void onPostResume();
@@ -3944,7 +3957,6 @@
public class ActivityOptions {
method public android.graphics.Rect getLaunchBounds();
- method public boolean hasLaunchBounds();
method public static android.app.ActivityOptions makeBasic();
method public static android.app.ActivityOptions makeClipRevealAnimation(android.view.View, int, int, int, int);
method public static android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int);
@@ -4774,6 +4786,7 @@
method public android.content.Context getContext();
method public android.content.Context getTargetContext();
method public android.app.UiAutomation getUiAutomation();
+ method public android.app.UiAutomation getUiAutomation(int);
method public boolean invokeContextMenuAction(android.app.Activity, int, int);
method public boolean invokeMenuActionSync(android.app.Activity, int, int);
method public boolean isProfiling();
@@ -5670,6 +5683,7 @@
public final class UiAutomation {
method public void clearWindowAnimationFrameStats();
method public boolean clearWindowContentFrameStats(int);
+ method public void destroy();
method public android.view.accessibility.AccessibilityEvent executeAndWaitForEvent(java.lang.Runnable, android.app.UiAutomation.AccessibilityEventFilter, long) throws java.util.concurrent.TimeoutException;
method public android.os.ParcelFileDescriptor executeShellCommand(java.lang.String);
method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
@@ -5686,6 +5700,7 @@
method public final void setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo);
method public android.graphics.Bitmap takeScreenshot();
method public void waitForIdle(long, long) throws java.util.concurrent.TimeoutException;
+ field public static final int FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES = 1; // 0x1
field public static final int ROTATION_FREEZE_0 = 0; // 0x0
field public static final int ROTATION_FREEZE_180 = 2; // 0x2
field public static final int ROTATION_FREEZE_270 = 3; // 0x3
@@ -5904,6 +5919,7 @@
method public void onProfileProvisioningComplete(android.content.Context, android.content.Intent);
method public deprecated void onReadyForUserInitialization(android.content.Context, android.content.Intent);
method public void onReceive(android.content.Context, android.content.Intent);
+ method public void onSecurityLogsAvailable(android.content.Context, android.content.Intent);
method public void onSystemUpdatePending(android.content.Context, android.content.Intent, long);
field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLED = "android.app.action.DEVICE_ADMIN_DISABLED";
field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLE_REQUESTED = "android.app.action.DEVICE_ADMIN_DISABLE_REQUESTED";
@@ -5952,6 +5968,7 @@
method public int getCurrentFailedPasswordAttempts();
method public deprecated java.lang.String getDeviceInitializerApp();
method public deprecated android.content.ComponentName getDeviceInitializerComponent();
+ method public boolean getDeviceLoggingEnabled(android.content.ComponentName);
method public java.lang.String getDeviceOwner();
method public java.lang.String getDeviceOwnerLockScreenInfo();
method public java.lang.String getDeviceOwnerNameOnAnyUser();
@@ -5961,6 +5978,7 @@
method public int getMaximumFailedPasswordsForWipe(android.content.ComponentName);
method public long getMaximumTimeToLock(android.content.ComponentName);
method public int getOrganizationColor(android.content.ComponentName);
+ method public java.lang.String getOrganizationName(android.content.ComponentName);
method public boolean getPackageSuspended(android.content.ComponentName, java.lang.String);
method public android.app.admin.DevicePolicyManager getParentProfileInstance(android.content.ComponentName);
method public long getPasswordExpiration(android.content.ComponentName);
@@ -6014,6 +6032,8 @@
method public boolean removeUser(android.content.ComponentName, android.os.UserHandle);
method public boolean requestBugreport(android.content.ComponentName);
method public boolean resetPassword(java.lang.String, int);
+ method public java.util.List<android.auditing.SecurityLog.SecurityEvent> retrieveDeviceLogs(android.content.ComponentName);
+ method public java.util.List<android.auditing.SecurityLog.SecurityEvent> retrievePreviousDeviceLogs(android.content.ComponentName);
method public void setAccountManagementDisabled(android.content.ComponentName, java.lang.String, boolean);
method public deprecated boolean setActiveProfileOwner(android.content.ComponentName, java.lang.String) throws java.lang.IllegalArgumentException;
method public boolean setAlwaysOnVpnPackage(android.content.ComponentName, java.lang.String);
@@ -6026,6 +6046,7 @@
method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException;
method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);
method public void setCrossProfileContactsSearchDisabled(android.content.ComponentName, boolean);
+ method public void setDeviceLoggingEnabled(android.content.ComponentName, boolean);
method public boolean setDeviceOwnerLockScreenInfo(android.content.ComponentName, java.lang.String);
method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);
method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);
@@ -6036,6 +6057,7 @@
method public void setMaximumFailedPasswordsForWipe(android.content.ComponentName, int);
method public void setMaximumTimeToLock(android.content.ComponentName, long);
method public void setOrganizationColor(android.content.ComponentName, int);
+ method public void setOrganizationName(android.content.ComponentName, java.lang.String);
method public boolean setPackageSuspended(android.content.ComponentName, java.lang.String, boolean);
method public void setPasswordExpirationTimeout(android.content.ComponentName, long);
method public void setPasswordHistoryLength(android.content.ComponentName, int);
@@ -6558,7 +6580,6 @@
public static class NetworkStats.Bucket {
ctor public NetworkStats.Bucket();
method public long getEndTimeStamp();
- method public int getMetering();
method public int getRoaming();
method public long getRxBytes();
method public long getRxPackets();
@@ -6567,9 +6588,6 @@
method public long getTxBytes();
method public long getTxPackets();
method public int getUid();
- field public static final int METERING_ALL = -1; // 0xffffffff
- field public static final int METERING_DEFAULT = 1; // 0x1
- field public static final int METERING_METERED = 2; // 0x2
field public static final int ROAMING_ALL = -1; // 0xffffffff
field public static final int ROAMING_DEFAULT = 1; // 0x1
field public static final int ROAMING_ROAMING = 2; // 0x2
@@ -8212,6 +8230,7 @@
method public abstract java.lang.String[] databaseList();
method public abstract boolean deleteDatabase(java.lang.String);
method public abstract boolean deleteFile(java.lang.String);
+ method public abstract boolean deleteSharedPreferences(java.lang.String);
method public abstract void enforceCallingOrSelfPermission(java.lang.String, java.lang.String);
method public abstract void enforceCallingOrSelfUriPermission(android.net.Uri, int, java.lang.String);
method public abstract void enforceCallingPermission(java.lang.String, java.lang.String);
@@ -8265,6 +8284,8 @@
method public abstract boolean isCredentialEncryptedStorage();
method public abstract boolean isDeviceEncryptedStorage();
method public boolean isRestricted();
+ method public abstract boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
+ method public abstract boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
method public final android.content.res.TypedArray obtainStyledAttributes(int[]);
method public final android.content.res.TypedArray obtainStyledAttributes(int, int[]) throws android.content.res.Resources.NotFoundException;
method public final android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[]);
@@ -8412,6 +8433,7 @@
method public java.lang.String[] databaseList();
method public boolean deleteDatabase(java.lang.String);
method public boolean deleteFile(java.lang.String);
+ method public boolean deleteSharedPreferences(java.lang.String);
method public void enforceCallingOrSelfPermission(java.lang.String, java.lang.String);
method public void enforceCallingOrSelfUriPermission(android.net.Uri, int, java.lang.String);
method public void enforceCallingPermission(java.lang.String, java.lang.String);
@@ -8458,6 +8480,8 @@
method public void grantUriPermission(java.lang.String, android.net.Uri, int);
method public boolean isCredentialEncryptedStorage();
method public boolean isDeviceEncryptedStorage();
+ method public boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
+ method public boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
method public java.io.FileInputStream openFileInput(java.lang.String) throws java.io.FileNotFoundException;
method public java.io.FileOutputStream openFileOutput(java.lang.String, int) throws java.io.FileNotFoundException;
method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory);
@@ -8941,7 +8965,7 @@
field public static final int FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS = 8388608; // 0x800000
field public static final int FLAG_ACTIVITY_FORWARD_RESULT = 33554432; // 0x2000000
field public static final int FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY = 1048576; // 0x100000
- field public static final int FLAG_ACTIVITY_LAUNCH_TO_SIDE = 4096; // 0x1000
+ field public static final int FLAG_ACTIVITY_LAUNCH_ADJACENT = 4096; // 0x1000
field public static final int FLAG_ACTIVITY_MULTIPLE_TASK = 134217728; // 0x8000000
field public static final int FLAG_ACTIVITY_NEW_DOCUMENT = 524288; // 0x80000
field public static final int FLAG_ACTIVITY_NEW_TASK = 268435456; // 0x10000000
@@ -9958,6 +9982,7 @@
method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
method public abstract boolean isSafeMode();
method public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);
+ method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceiversAsUser(android.content.Intent, int, android.os.UserHandle);
method public abstract java.util.List<android.content.pm.ProviderInfo> queryContentProviders(java.lang.String, int, int);
method public abstract java.util.List<android.content.pm.InstrumentationInfo> queryInstrumentation(java.lang.String, int);
method public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentActivities(android.content.Intent, int);
@@ -15125,6 +15150,66 @@
package android.hardware.location {
+ public class ContextHubInfo {
+ ctor public ContextHubInfo();
+ method public int describeContents();
+ method public int getId();
+ method public android.hardware.location.MemoryRegion[] getMemoryRegions();
+ method public java.lang.String getName();
+ method public float getPeakMips();
+ method public float getPeakPowerDrawMw();
+ method public int getPlatformVersion();
+ method public float getSleepPowerDrawMw();
+ method public int getStaticSwVersion();
+ method public float getStoppedPowerDrawMw();
+ method public int[] getSupportedSensors();
+ method public java.lang.String getToolchain();
+ method public int getToolchainVersion();
+ method public java.lang.String getVendor();
+ method public void setId(int);
+ method public void setMemoryRegions(android.hardware.location.MemoryRegion[]);
+ method public void setName(java.lang.String);
+ method public void setPeakMips(float);
+ method public void setPeakPowerDrawMw(float);
+ method public void setPlatformVersion(int);
+ method public void setSleepPowerDrawMw(float);
+ method public void setStaticSwVersion(int);
+ method public void setStoppedPowerDrawMw(float);
+ method public void setSupportedSensors(int[]);
+ method public void setToolchain(java.lang.String);
+ method public void setToolchainVersion(int);
+ method public void setVendor(java.lang.String);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.hardware.location.ContextHubInfo> CREATOR;
+ }
+
+ public final class ContextHubManager {
+ method public java.lang.Integer[] findNanoAppOnHub(int, android.hardware.location.NanoAppFilter);
+ method public int[] getContexthubHandles();
+ method public android.hardware.location.ContextHubInfo getContexthubInfo(int);
+ method public android.hardware.location.NanoAppInstanceInfo getNanoAppInstanceInfo(int);
+ method public int loadNanoApp(int, android.hardware.location.NanoApp);
+ method public int sendMessage(int, int, android.hardware.location.ContextHubMessage);
+ method public int unloadNanoApp(int);
+ field public static final int ANY_HUB = -1; // 0xffffffff
+ field public static final int MSG_DATA_SEND = 3; // 0x3
+ field public static final int MSG_LOAD_NANO_APP = 1; // 0x1
+ field public static final int MSG_UNLOAD_NANO_APP = 2; // 0x2
+ }
+
+ public class ContextHubMessage {
+ ctor public ContextHubMessage(int, int, byte[]);
+ method public int describeContents();
+ method public byte[] getData();
+ method public int getMsgType();
+ method public int getVersion();
+ method public void setMsgData(byte[]);
+ method public void setMsgType(int);
+ method public void setVersion(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.hardware.location.ContextHubMessage> CREATOR;
+ }
+
public final class GeofenceHardware {
ctor public GeofenceHardware(android.hardware.location.IGeofenceHardware);
method public boolean addGeofence(int, int, android.hardware.location.GeofenceHardwareRequest, android.hardware.location.GeofenceHardwareCallback);
@@ -15241,6 +15326,89 @@
method public abstract void onMonitoringSystemChange(android.hardware.location.GeofenceHardwareMonitorEvent) throws android.os.RemoteException;
}
+ public class MemoryRegion implements android.os.Parcelable {
+ ctor public MemoryRegion(android.os.Parcel);
+ method public int describeContents();
+ method public int getCapacityBytes();
+ method public int getFreeCapacityBytes();
+ method public boolean isExecutable();
+ method public boolean isReadable();
+ method public boolean isWritable();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.hardware.location.MemoryRegion> CREATOR;
+ }
+
+ public class NanoApp {
+ ctor public NanoApp();
+ method public int describeContents();
+ method public byte[] getAppBinary();
+ method public int getAppId();
+ method public int getAppVersion();
+ method public java.lang.String getName();
+ method public int getNeededExecMemBytes();
+ method public int getNeededReadMemBytes();
+ method public int[] getNeededSensors();
+ method public int getNeededWriteMemBytes();
+ method public int[] getOutputEvents();
+ method public java.lang.String getPublisher();
+ method public void setAppBinary(byte[]);
+ method public void setAppId(int);
+ method public void setAppVersion(int);
+ method public void setName(java.lang.String);
+ method public void setNeededExecMemBytes(int);
+ method public void setNeededReadMemBytes(int);
+ method public void setNeededSensors(int[]);
+ method public void setNeededWriteMemBytes(int);
+ method public void setOutputEvents(int[]);
+ method public void setPublisher(java.lang.String);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.hardware.location.NanoApp> CREATOR;
+ }
+
+ public class NanoAppFilter {
+ ctor public NanoAppFilter(long, int, int, long);
+ method public int describeContents();
+ method public boolean testMatch(android.hardware.location.NanoAppInstanceInfo);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int APP_ANY = -1; // 0xffffffff
+ field public static final android.os.Parcelable.Creator<android.hardware.location.NanoAppFilter> CREATOR;
+ field public static final int FLAGS_VERSION_ANY = -1; // 0xffffffff
+ field public static final int FLAGS_VERSION_GREAT_THAN = 2; // 0x2
+ field public static final int FLAGS_VERSION_LESS_THAN = 4; // 0x4
+ field public static final int FLAGS_VERSION_STRICTLY_EQUAL = 8; // 0x8
+ field public static final int HUB_ANY = -1; // 0xffffffff
+ field public static final int VENDOR_ANY = -1; // 0xffffffff
+ }
+
+ public class NanoAppInstanceInfo {
+ ctor public NanoAppInstanceInfo();
+ method public int describeContents();
+ method public int getAppId();
+ method public int getAppVersion();
+ method public int getContexthubId();
+ method public int getHandle();
+ method public java.lang.String getName();
+ method public int getNeededExecMemBytes();
+ method public int getNeededReadMemBytes();
+ method public int[] getNeededSensors();
+ method public int getNeededWriteMemBytes();
+ method public int[] getOutputEvents();
+ method public java.lang.String getPublisher();
+ method public void setAppId(int);
+ method public void setAppVersion(int);
+ method public void setContexthubId(int);
+ method public void setHandle(int);
+ method public void setName(java.lang.String);
+ method public void setNeededExecMemBytes(int);
+ method public void setNeededReadMemBytes(int);
+ method public void setNeededSensors(int[]);
+ method public void setNeededWriteMemBytes(int);
+ method public void setOutputEvents(int[]);
+ method public void setPublisher(java.lang.String);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.hardware.location.NanoAppInstanceInfo> CREATOR;
+ }
+
}
package android.hardware.radio {
@@ -20995,6 +21163,7 @@
method public android.media.AudioDeviceInfo getRoutedDevice();
method public int getSampleRate();
method public int getState();
+ method public int getTimestamp(android.media.AudioTimestamp, int);
method public int read(byte[], int, int);
method public int read(byte[], int, int, int);
method public int read(short[], int, int);
@@ -21068,6 +21237,8 @@
public final class AudioTimestamp {
ctor public AudioTimestamp();
+ field public static final int TIMEBASE_BOOTTIME = 1; // 0x1
+ field public static final int TIMEBASE_MONOTONIC = 0; // 0x0
field public long framePosition;
field public long nanoTime;
}
@@ -23695,6 +23866,7 @@
method public void setRatingType(int);
method public void setSessionActivity(android.app.PendingIntent);
field public static final int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1
+ field public static final int FLAG_HANDLES_PREPARE_ONLY = 4; // 0x4
field public static final int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2
}
@@ -23773,6 +23945,7 @@
field public static final long ACTION_SKIP_TO_QUEUE_ITEM = 4096L; // 0x1000L
field public static final long ACTION_STOP = 1L; // 0x1L
field public static final android.os.Parcelable.Creator<android.media.session.PlaybackState> CREATOR;
+ field public static final java.lang.String EXTRA_PREPARE_ONLY = "android.media.session.extra.PREPARE_ONLY";
field public static final long PLAYBACK_POSITION_UNKNOWN = -1L; // 0xffffffffffffffffL
field public static final int STATE_BUFFERING = 6; // 0x6
field public static final int STATE_CONNECTING = 8; // 0x8
@@ -24263,7 +24436,7 @@
method public void onInputRemoved(java.lang.String);
method public void onInputStateChanged(java.lang.String, int);
method public void onInputUpdated(java.lang.String);
- method public void onTvInputInfoChanged(java.lang.String, android.media.tv.TvInputInfo);
+ method public void onTvInputInfoChanged(android.media.tv.TvInputInfo);
}
public abstract class TvInputService extends android.app.Service {
@@ -24275,7 +24448,7 @@
method public java.lang.String onHardwareRemoved(android.media.tv.TvInputHardwareInfo);
method public android.media.tv.TvInputInfo onHdmiDeviceAdded(android.hardware.hdmi.HdmiDeviceInfo);
method public java.lang.String onHdmiDeviceRemoved(android.hardware.hdmi.HdmiDeviceInfo);
- method public final void setTvInputInfo(java.lang.String, android.media.tv.TvInputInfo);
+ method public static final void setTvInputInfo(android.content.Context, android.media.tv.TvInputInfo);
field public static final java.lang.String SERVICE_INTERFACE = "android.media.tv.TvInputService";
field public static final java.lang.String SERVICE_META_DATA = "android.media.tv.input";
}
@@ -24355,7 +24528,7 @@
method public void stopRecording();
}
- public class TvRecordingClient.RecordingCallback {
+ public static abstract class TvRecordingClient.RecordingCallback {
ctor public TvRecordingClient.RecordingCallback();
method public void onConnected();
method public void onDisconnected();
@@ -30422,6 +30595,10 @@
field public static final int OPEN = 32; // 0x20
}
+ public class FileUriExposedException extends java.lang.RuntimeException {
+ ctor public FileUriExposedException(java.lang.String);
+ }
+
public class Handler {
ctor public Handler();
ctor public Handler(android.os.Handler.Callback);
@@ -31021,6 +31198,7 @@
method public android.os.StrictMode.VmPolicy.Builder detectLeakedSqlLiteObjects();
method public android.os.StrictMode.VmPolicy.Builder penaltyDeath();
method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnCleartextNetwork();
+ method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnFileUriExposure();
method public android.os.StrictMode.VmPolicy.Builder penaltyDropBox();
method public android.os.StrictMode.VmPolicy.Builder penaltyLog();
method public android.os.StrictMode.VmPolicy.Builder setClassInstanceLimit(java.lang.Class, int);
@@ -31064,6 +31242,7 @@
method public deprecated boolean isOwner();
method public boolean isSystem();
method public static int myUserId();
+ method public static android.os.UserHandle of(int);
method public static android.os.UserHandle readFromParcel(android.os.Parcel);
method public void writeToParcel(android.os.Parcel, int);
method public static void writeToParcel(android.os.UserHandle, android.os.Parcel);
@@ -31078,6 +31257,7 @@
method public android.os.PersistableBundle getSeedAccountOptions();
method public java.lang.String getSeedAccountType();
method public long getSerialNumberForUser(android.os.UserHandle);
+ method public long[] getSerialNumbersOfUsers(boolean);
method public int getUserCount();
method public long getUserCreationTime(android.os.UserHandle);
method public android.os.UserHandle getUserForSerialNumber(long);
@@ -31495,6 +31675,9 @@
method public static void setDefaultValues(android.content.Context, java.lang.String, int, int, boolean);
method public void setSharedPreferencesMode(int);
method public void setSharedPreferencesName(java.lang.String);
+ method public void setStorageCredentialEncrypted();
+ method public void setStorageDefault();
+ method public void setStorageDeviceEncrypted();
field public static final java.lang.String KEY_HAS_SET_DEFAULT_VALUES = "_has_set_default_values";
field public static final java.lang.String METADATA_KEY_PREFERENCES = "android.preference";
}
@@ -33573,6 +33756,7 @@
public abstract class DocumentsProvider extends android.content.ContentProvider {
ctor public DocumentsProvider();
+ method public java.lang.String copyDocument(java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public java.lang.String createDocument(java.lang.String, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public final int delete(android.net.Uri, java.lang.String, java.lang.String[]);
method public void deleteDocument(java.lang.String) throws java.io.FileNotFoundException;
@@ -33580,6 +33764,7 @@
method public final java.lang.String getType(android.net.Uri);
method public final android.net.Uri insert(android.net.Uri, android.content.ContentValues);
method public boolean isChildDocument(java.lang.String, java.lang.String);
+ method public java.lang.String moveDocument(java.lang.String, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public final android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
method public final android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
method public abstract android.os.ParcelFileDescriptor openDocument(java.lang.String, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
@@ -34077,6 +34262,7 @@
field public static final java.lang.String ACTION_INPUT_METHOD_SETTINGS = "android.settings.INPUT_METHOD_SETTINGS";
field public static final java.lang.String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS";
field public static final java.lang.String ACTION_INTERNAL_STORAGE_SETTINGS = "android.settings.INTERNAL_STORAGE_SETTINGS";
+ field public static final java.lang.String ACTION_KEYBOARD_LAYOUT_SETTINGS = "android.settings.KEYBOARD_LAYOUT_SETTINGS";
field public static final java.lang.String ACTION_LOCALE_SETTINGS = "android.settings.LOCALE_SETTINGS";
field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS";
field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";
@@ -39448,7 +39634,7 @@
method public void testActivityTestCaseSetUpProperly() throws java.lang.Exception;
}
- public abstract class ActivityInstrumentationTestCase2 extends android.test.ActivityTestCase {
+ public abstract deprecated class ActivityInstrumentationTestCase2 extends android.test.ActivityTestCase {
ctor public deprecated ActivityInstrumentationTestCase2(java.lang.String, java.lang.Class<T>);
ctor public ActivityInstrumentationTestCase2(java.lang.Class<T>);
method public T getActivity();
@@ -39456,14 +39642,14 @@
method public void setActivityIntent(android.content.Intent);
}
- public abstract class ActivityTestCase extends android.test.InstrumentationTestCase {
+ public abstract deprecated class ActivityTestCase extends android.test.InstrumentationTestCase {
ctor public ActivityTestCase();
method protected android.app.Activity getActivity();
method protected void scrubClass(java.lang.Class<?>) throws java.lang.IllegalAccessException;
method protected void setActivity(android.app.Activity);
}
- public abstract class ActivityUnitTestCase extends android.test.ActivityTestCase {
+ public abstract deprecated class ActivityUnitTestCase extends android.test.ActivityTestCase {
ctor public ActivityUnitTestCase(java.lang.Class<T>);
method public T getActivity();
method public int getFinishedActivityRequest();
@@ -39476,7 +39662,7 @@
method protected T startActivity(android.content.Intent, android.os.Bundle, java.lang.Object);
}
- public class AndroidTestCase extends junit.framework.TestCase {
+ public deprecated class AndroidTestCase extends junit.framework.TestCase {
ctor public AndroidTestCase();
method public void assertActivityRequiresPermission(java.lang.String, java.lang.String, java.lang.String);
method public void assertReadingContentUriRequiresPermission(android.net.Uri, java.lang.String);
@@ -39488,7 +39674,7 @@
field protected android.content.Context mContext;
}
- public class AndroidTestRunner extends junit.runner.BaseTestRunner {
+ public deprecated class AndroidTestRunner extends junit.runner.BaseTestRunner {
ctor public AndroidTestRunner();
method public void addTestListener(junit.framework.TestListener);
method public void clearTestListeners();
@@ -39509,7 +39695,7 @@
method public void testStarted(java.lang.String);
}
- public abstract class ApplicationTestCase extends android.test.AndroidTestCase {
+ public abstract deprecated class ApplicationTestCase extends android.test.AndroidTestCase {
ctor public ApplicationTestCase(java.lang.Class<T>);
method protected final void createApplication();
method public T getApplication();
@@ -39527,10 +39713,10 @@
ctor public ComparisonFailure(java.lang.String, java.lang.String, java.lang.String);
}
- public abstract class FlakyTest implements java.lang.annotation.Annotation {
+ public abstract deprecated class FlakyTest implements java.lang.annotation.Annotation {
}
- public class InstrumentationTestCase extends junit.framework.TestCase {
+ public deprecated class InstrumentationTestCase extends junit.framework.TestCase {
ctor public InstrumentationTestCase();
method public android.app.Instrumentation getInstrumentation();
method public deprecated void injectInsrumentation(android.app.Instrumentation);
@@ -39543,7 +39729,7 @@
method public void sendRepeatedKeys(int...);
}
- public class InstrumentationTestRunner extends android.app.Instrumentation implements android.test.TestSuiteProvider {
+ public deprecated class InstrumentationTestRunner extends android.app.Instrumentation implements android.test.TestSuiteProvider {
ctor public InstrumentationTestRunner();
method public junit.framework.TestSuite getAllTests();
method protected android.test.AndroidTestRunner getAndroidTestRunner();
@@ -39562,14 +39748,14 @@
field public static final int REPORT_VALUE_RESULT_START = 1; // 0x1
}
- public class InstrumentationTestSuite extends junit.framework.TestSuite {
+ public deprecated class InstrumentationTestSuite extends junit.framework.TestSuite {
ctor public InstrumentationTestSuite(android.app.Instrumentation);
ctor public InstrumentationTestSuite(java.lang.String, android.app.Instrumentation);
ctor public InstrumentationTestSuite(java.lang.Class, android.app.Instrumentation);
method public void addTestSuite(java.lang.Class);
}
- public class IsolatedContext extends android.content.ContextWrapper {
+ public deprecated class IsolatedContext extends android.content.ContextWrapper {
ctor public IsolatedContext(android.content.ContentResolver, android.content.Context);
method public java.util.List<android.content.Intent> getAndClearBroadcastIntents();
}
@@ -39579,7 +39765,7 @@
method public T getLoaderResultSynchronously(android.content.Loader<T>);
}
- public final class MoreAsserts {
+ public final deprecated class MoreAsserts {
method public static void assertAssignableFrom(java.lang.Class<?>, java.lang.Object);
method public static void assertAssignableFrom(java.lang.Class<?>, java.lang.Class<?>);
method public static java.util.regex.MatchResult assertContainsRegex(java.lang.String, java.lang.String, java.lang.String);
@@ -39618,7 +39804,7 @@
method public static void checkEqualsAndHashCodeMethods(java.lang.Object, java.lang.Object, boolean);
}
- public abstract interface PerformanceTestCase {
+ public abstract deprecated interface PerformanceTestCase {
method public abstract boolean isPerformanceOnly();
method public abstract int startPerformance(android.test.PerformanceTestCase.Intermediates);
}
@@ -39647,7 +39833,7 @@
method public static android.content.ContentResolver newResolverWithContentProviderFromSql(android.content.Context, java.lang.String, java.lang.Class<T>, java.lang.String, java.lang.String, int, java.lang.String) throws java.lang.IllegalAccessException, java.lang.InstantiationException;
}
- public class RenamingDelegatingContext extends android.content.ContextWrapper {
+ public deprecated class RenamingDelegatingContext extends android.content.ContextWrapper {
ctor public RenamingDelegatingContext(android.content.Context, java.lang.String);
ctor public RenamingDelegatingContext(android.content.Context, android.content.Context, java.lang.String);
method public java.lang.String getDatabasePrefix();
@@ -39656,7 +39842,7 @@
method public static T providerWithRenamedContext(java.lang.Class<T>, android.content.Context, java.lang.String, boolean) throws java.lang.IllegalAccessException, java.lang.InstantiationException;
}
- public abstract class ServiceTestCase extends android.test.AndroidTestCase {
+ public abstract deprecated class ServiceTestCase extends android.test.AndroidTestCase {
ctor public ServiceTestCase(java.lang.Class<T>);
method protected android.os.IBinder bindService(android.content.Intent);
method public android.app.Application getApplication();
@@ -39669,23 +39855,23 @@
method public void testServiceTestCaseSetUpProperly() throws java.lang.Exception;
}
- public abstract class SingleLaunchActivityTestCase extends android.test.InstrumentationTestCase {
+ public abstract deprecated class SingleLaunchActivityTestCase extends android.test.InstrumentationTestCase {
ctor public SingleLaunchActivityTestCase(java.lang.String, java.lang.Class<T>);
method public T getActivity();
method public void testActivityTestCaseSetUpProperly() throws java.lang.Exception;
}
- public class SyncBaseInstrumentation extends android.test.InstrumentationTestCase {
+ public deprecated class SyncBaseInstrumentation extends android.test.InstrumentationTestCase {
ctor public SyncBaseInstrumentation();
method protected void cancelSyncsandDisableAutoSync();
method protected void syncProvider(android.net.Uri, java.lang.String, java.lang.String) throws java.lang.Exception;
}
- public abstract interface TestSuiteProvider {
+ public abstract deprecated interface TestSuiteProvider {
method public abstract junit.framework.TestSuite getTestSuite();
}
- public class TouchUtils {
+ public deprecated class TouchUtils {
ctor public TouchUtils();
method public static void clickView(android.test.InstrumentationTestCase, android.view.View);
method public static deprecated void drag(android.test.ActivityInstrumentationTestCase, float, float, float, float, int);
@@ -39720,10 +39906,10 @@
method public static void touchAndCancelView(android.test.InstrumentationTestCase, android.view.View);
}
- public abstract class UiThreadTest implements java.lang.annotation.Annotation {
+ public abstract deprecated class UiThreadTest implements java.lang.annotation.Annotation {
}
- public class ViewAsserts {
+ public deprecated class ViewAsserts {
method public static void assertBaselineAligned(android.view.View, android.view.View);
method public static void assertBottomAligned(android.view.View, android.view.View);
method public static void assertBottomAligned(android.view.View, android.view.View, int);
@@ -39748,11 +39934,11 @@
package android.test.mock {
- public class MockApplication extends android.app.Application {
+ public deprecated class MockApplication extends android.app.Application {
ctor public MockApplication();
}
- public class MockContentProvider extends android.content.ContentProvider {
+ public deprecated class MockContentProvider extends android.content.ContentProvider {
ctor protected MockContentProvider();
ctor public MockContentProvider(android.content.Context);
ctor public MockContentProvider(android.content.Context, java.lang.String, java.lang.String, android.content.pm.PathPermission[]);
@@ -39764,13 +39950,13 @@
method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]);
}
- public class MockContentResolver extends android.content.ContentResolver {
+ public deprecated class MockContentResolver extends android.content.ContentResolver {
ctor public MockContentResolver();
ctor public MockContentResolver(android.content.Context);
method public void addProvider(java.lang.String, android.content.ContentProvider);
}
- public class MockContext extends android.content.Context {
+ public deprecated class MockContext extends android.content.Context {
ctor public MockContext();
method public boolean bindService(android.content.Intent, android.content.ServiceConnection, int);
method public int checkCallingOrSelfPermission(java.lang.String);
@@ -39790,6 +39976,7 @@
method public java.lang.String[] databaseList();
method public boolean deleteDatabase(java.lang.String);
method public boolean deleteFile(java.lang.String);
+ method public boolean deleteSharedPreferences(java.lang.String);
method public void enforceCallingOrSelfPermission(java.lang.String, java.lang.String);
method public void enforceCallingOrSelfUriPermission(android.net.Uri, int, java.lang.String);
method public void enforceCallingPermission(java.lang.String, java.lang.String);
@@ -39835,6 +40022,8 @@
method public void grantUriPermission(java.lang.String, android.net.Uri, int);
method public boolean isCredentialEncryptedStorage();
method public boolean isDeviceEncryptedStorage();
+ method public boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
+ method public boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
method public java.io.FileInputStream openFileInput(java.lang.String) throws java.io.FileNotFoundException;
method public java.io.FileOutputStream openFileOutput(java.lang.String, int) throws java.io.FileNotFoundException;
method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory);
@@ -39874,7 +40063,7 @@
method public void unregisterReceiver(android.content.BroadcastReceiver);
}
- public class MockCursor implements android.database.Cursor {
+ public deprecated class MockCursor implements android.database.Cursor {
ctor public MockCursor();
method public void close();
method public void copyStringToBuffer(int, android.database.CharArrayBuffer);
@@ -39919,13 +40108,13 @@
method public void unregisterDataSetObserver(android.database.DataSetObserver);
}
- public class MockDialogInterface implements android.content.DialogInterface {
+ public deprecated class MockDialogInterface implements android.content.DialogInterface {
ctor public MockDialogInterface();
method public void cancel();
method public void dismiss();
}
- public class MockPackageManager extends android.content.pm.PackageManager {
+ public deprecated class MockPackageManager extends android.content.pm.PackageManager {
ctor public MockPackageManager();
method public void addOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener);
method public void addPackageToPreferred(java.lang.String);
@@ -40019,7 +40208,7 @@
method public void verifyPendingInstall(int, int);
}
- public class MockResources extends android.content.res.Resources {
+ public deprecated class MockResources extends android.content.res.Resources {
ctor public MockResources();
}
@@ -40060,19 +40249,19 @@
package android.test.suitebuilder.annotation {
- public abstract class LargeTest implements java.lang.annotation.Annotation {
+ public abstract deprecated class LargeTest implements java.lang.annotation.Annotation {
}
- public abstract class MediumTest implements java.lang.annotation.Annotation {
+ public abstract deprecated class MediumTest implements java.lang.annotation.Annotation {
}
- public abstract class SmallTest implements java.lang.annotation.Annotation {
+ public abstract deprecated class SmallTest implements java.lang.annotation.Annotation {
}
- public abstract class Smoke implements java.lang.annotation.Annotation {
+ public abstract deprecated class Smoke implements java.lang.annotation.Annotation {
}
- public abstract class Suppress implements java.lang.annotation.Annotation {
+ public abstract deprecated class Suppress implements java.lang.annotation.Annotation {
}
}
@@ -42126,6 +42315,7 @@
field public static final int DENSITY_420 = 420; // 0x1a4
field public static final int DENSITY_560 = 560; // 0x230
field public static final int DENSITY_DEFAULT = 160; // 0xa0
+ field public static final int DENSITY_DEVICE_STABLE;
field public static final int DENSITY_HIGH = 240; // 0xf0
field public static final int DENSITY_LOW = 120; // 0x78
field public static final int DENSITY_MEDIUM = 160; // 0xa0
@@ -53907,6 +54097,9 @@
public abstract class Inherited implements java.lang.annotation.Annotation {
}
+ public abstract class Repeatable implements java.lang.annotation.Annotation {
+ }
+
public abstract class Retention implements java.lang.annotation.Annotation {
}
@@ -64566,6 +64759,7 @@
ctor public ExtendedSSLSession();
method public abstract java.lang.String[] getLocalSupportedSignatureAlgorithms();
method public abstract java.lang.String[] getPeerSupportedSignatureAlgorithms();
+ method public java.util.List<javax.net.ssl.SNIServerName> getRequestedServerNames();
}
public class HandshakeCompletedEvent extends java.util.EventObject {
@@ -64638,6 +64832,25 @@
public abstract interface ManagerFactoryParameters {
}
+ public final class SNIHostName extends javax.net.ssl.SNIServerName {
+ ctor public SNIHostName(java.lang.String);
+ ctor public SNIHostName(byte[]);
+ method public static javax.net.ssl.SNIMatcher createSNIMatcher(java.lang.String);
+ method public java.lang.String getAsciiName();
+ }
+
+ public abstract class SNIMatcher {
+ ctor protected SNIMatcher(int);
+ method public final int getType();
+ method public abstract boolean matches(javax.net.ssl.SNIServerName);
+ }
+
+ public abstract class SNIServerName {
+ ctor protected SNIServerName(int, byte[]);
+ method public final byte[] getEncoded();
+ method public final int getType();
+ }
+
public class SSLContext {
ctor protected SSLContext(javax.net.ssl.SSLContextSpi, java.security.Provider, java.lang.String);
method public final javax.net.ssl.SSLEngine createSSLEngine();
@@ -64759,12 +64972,18 @@
method public java.lang.String getEndpointIdentificationAlgorithm();
method public boolean getNeedClientAuth();
method public java.lang.String[] getProtocols();
+ method public final java.util.Collection<javax.net.ssl.SNIMatcher> getSNIMatchers();
+ method public final java.util.List<javax.net.ssl.SNIServerName> getServerNames();
+ method public final boolean getUseCipherSuitesOrder();
method public boolean getWantClientAuth();
method public void setAlgorithmConstraints(java.security.AlgorithmConstraints);
method public void setCipherSuites(java.lang.String[]);
method public void setEndpointIdentificationAlgorithm(java.lang.String);
method public void setNeedClientAuth(boolean);
method public void setProtocols(java.lang.String[]);
+ method public final void setSNIMatchers(java.util.Collection<javax.net.ssl.SNIMatcher>);
+ method public final void setServerNames(java.util.List<javax.net.ssl.SNIServerName>);
+ method public final void setUseCipherSuitesOrder(boolean);
method public void setWantClientAuth(boolean);
}
@@ -64892,6 +65111,10 @@
method public abstract java.lang.String[] getSupportedCipherSuites();
}
+ public final class StandardConstants {
+ field public static final int SNI_HOST_NAME = 0; // 0x0
+ }
+
public abstract interface TrustManager {
}
diff --git a/api/system-removed.txt b/api/system-removed.txt
index 90a5dc7..27de913 100644
--- a/api/system-removed.txt
+++ b/api/system-removed.txt
@@ -192,7 +192,7 @@
package android.test.mock {
- public class MockPackageManager extends android.content.pm.PackageManager {
+ public deprecated class MockPackageManager extends android.content.pm.PackageManager {
method public deprecated java.lang.String getDefaultBrowserPackageName(int);
method public deprecated boolean setDefaultBrowserPackageName(java.lang.String, int);
}
diff --git a/api/test-current.txt b/api/test-current.txt
index 69ee311..c404906 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -437,7 +437,9 @@
field public static final deprecated int dayOfWeekBackground = 16843924; // 0x1010494
field public static final deprecated int dayOfWeekTextAppearance = 16843925; // 0x1010495
field public static final int debuggable = 16842767; // 0x101000f
+ field public static final int defaultHeight = 16844021; // 0x10104f5
field public static final int defaultValue = 16843245; // 0x10101ed
+ field public static final int defaultWidth = 16844020; // 0x10104f4
field public static final int delay = 16843212; // 0x10101cc
field public static final int dependency = 16843244; // 0x10101ec
field public static final int descendantFocusability = 16842993; // 0x10100f1
@@ -680,10 +682,8 @@
field public static final int indicatorStart = 16843729; // 0x10103d1
field public static final int inflatedId = 16842995; // 0x10100f3
field public static final int initOrder = 16842778; // 0x101001a
- field public static final int initialHeight = 16844021; // 0x10104f5
field public static final int initialKeyguardLayout = 16843714; // 0x10103c2
field public static final int initialLayout = 16843345; // 0x1010251
- field public static final int initialWidth = 16844020; // 0x10104f4
field public static final int innerRadius = 16843359; // 0x101025f
field public static final int innerRadiusRatio = 16843163; // 0x101019b
field public static final deprecated int inputMethod = 16843112; // 0x1010168
@@ -2625,6 +2625,7 @@
method public final android.accessibilityservice.AccessibilityService.MagnificationController getMagnificationController();
method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow();
method public final android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();
+ method public final android.accessibilityservice.AccessibilityService.SoftKeyboardController getSoftKeyboardController();
method public java.util.List<android.view.accessibility.AccessibilityWindowInfo> getWindows();
method public abstract void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
method public final android.os.IBinder onBind(android.content.Intent);
@@ -2683,6 +2684,18 @@
method public abstract void onMagnificationChanged(android.accessibilityservice.AccessibilityService.MagnificationController, android.graphics.Region, float, float, float);
}
+ public static final class AccessibilityService.SoftKeyboardController {
+ method public void addOnShowModeChangedListener(android.accessibilityservice.AccessibilityService.SoftKeyboardController.OnShowModeChangedListener);
+ method public void addOnShowModeChangedListener(android.accessibilityservice.AccessibilityService.SoftKeyboardController.OnShowModeChangedListener, android.os.Handler);
+ method public int getShowMode();
+ method public boolean removeOnShowModeChangedListener(android.accessibilityservice.AccessibilityService.SoftKeyboardController.OnShowModeChangedListener);
+ method public boolean setShowMode(int);
+ }
+
+ public static abstract interface AccessibilityService.SoftKeyboardController.OnShowModeChangedListener {
+ method public abstract void onShowModeChanged(android.accessibilityservice.AccessibilityService.SoftKeyboardController, int);
+ }
+
public class AccessibilityServiceInfo implements android.os.Parcelable {
ctor public AccessibilityServiceInfo();
method public static java.lang.String capabilityToString(int);
@@ -3395,7 +3408,7 @@
method public boolean dispatchTouchEvent(android.view.MotionEvent);
method public boolean dispatchTrackballEvent(android.view.MotionEvent);
method public void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
- method public void enterPictureInPictureMode();
+ method public void enterPictureInPicture();
method public android.view.View findViewById(int);
method public void finish();
method public void finishActivity(int);
@@ -3435,8 +3448,8 @@
method public android.view.Window getWindow();
method public android.view.WindowManager getWindowManager();
method public boolean hasWindowFocus();
- method public boolean inMultiWindowMode();
- method public boolean inPictureInPictureMode();
+ method public boolean inMultiWindow();
+ method public boolean inPictureInPicture();
method public void invalidateOptionsMenu();
method public boolean isChangingConfigurations();
method public final boolean isChild();
@@ -3490,7 +3503,7 @@
method public void onLowMemory();
method public boolean onMenuItemSelected(int, android.view.MenuItem);
method public boolean onMenuOpened(int, android.view.Menu);
- method public void onMultiWindowModeChanged(boolean);
+ method public void onMultiWindowChanged(boolean);
method public boolean onNavigateUp();
method public boolean onNavigateUpFromChild(android.app.Activity);
method protected void onNewIntent(android.content.Intent);
@@ -3498,7 +3511,7 @@
method public void onOptionsMenuClosed(android.view.Menu);
method public void onPanelClosed(int, android.view.Menu);
method protected void onPause();
- method public void onPictureInPictureModeChanged(boolean);
+ method public void onPictureInPictureChanged(boolean);
method protected void onPostCreate(android.os.Bundle);
method public void onPostCreate(android.os.Bundle, android.os.PersistableBundle);
method protected void onPostResume();
@@ -3821,7 +3834,6 @@
public class ActivityOptions {
method public android.graphics.Rect getLaunchBounds();
- method public boolean hasLaunchBounds();
method public static android.app.ActivityOptions makeBasic();
method public static android.app.ActivityOptions makeClipRevealAnimation(android.view.View, int, int, int, int);
method public static android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int);
@@ -4642,6 +4654,7 @@
method public android.content.Context getContext();
method public android.content.Context getTargetContext();
method public android.app.UiAutomation getUiAutomation();
+ method public android.app.UiAutomation getUiAutomation(int);
method public boolean invokeContextMenuAction(android.app.Activity, int, int);
method public boolean invokeMenuActionSync(android.app.Activity, int, int);
method public boolean isProfiling();
@@ -5538,6 +5551,7 @@
public final class UiAutomation {
method public void clearWindowAnimationFrameStats();
method public boolean clearWindowContentFrameStats(int);
+ method public void destroy();
method public android.view.accessibility.AccessibilityEvent executeAndWaitForEvent(java.lang.Runnable, android.app.UiAutomation.AccessibilityEventFilter, long) throws java.util.concurrent.TimeoutException;
method public android.os.ParcelFileDescriptor executeShellCommand(java.lang.String);
method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
@@ -5556,6 +5570,7 @@
method public final void setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo);
method public android.graphics.Bitmap takeScreenshot();
method public void waitForIdle(long, long) throws java.util.concurrent.TimeoutException;
+ field public static final int FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES = 1; // 0x1
field public static final int ROTATION_FREEZE_0 = 0; // 0x0
field public static final int ROTATION_FREEZE_180 = 2; // 0x2
field public static final int ROTATION_FREEZE_270 = 3; // 0x3
@@ -5770,6 +5785,7 @@
method public void onProfileProvisioningComplete(android.content.Context, android.content.Intent);
method public deprecated void onReadyForUserInitialization(android.content.Context, android.content.Intent);
method public void onReceive(android.content.Context, android.content.Intent);
+ method public void onSecurityLogsAvailable(android.content.Context, android.content.Intent);
method public void onSystemUpdatePending(android.content.Context, android.content.Intent, long);
field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLED = "android.app.action.DEVICE_ADMIN_DISABLED";
field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLE_REQUESTED = "android.app.action.DEVICE_ADMIN_DISABLE_REQUESTED";
@@ -5816,6 +5832,7 @@
method public boolean getCrossProfileContactsSearchDisabled(android.content.ComponentName);
method public java.util.List<java.lang.String> getCrossProfileWidgetProviders(android.content.ComponentName);
method public int getCurrentFailedPasswordAttempts();
+ method public boolean getDeviceLoggingEnabled(android.content.ComponentName);
method public java.lang.String getDeviceOwnerLockScreenInfo();
method public java.util.List<byte[]> getInstalledCaCerts(android.content.ComponentName);
method public int getKeyguardDisabledFeatures(android.content.ComponentName);
@@ -5823,6 +5840,7 @@
method public int getMaximumFailedPasswordsForWipe(android.content.ComponentName);
method public long getMaximumTimeToLock(android.content.ComponentName);
method public int getOrganizationColor(android.content.ComponentName);
+ method public java.lang.String getOrganizationName(android.content.ComponentName);
method public boolean getPackageSuspended(android.content.ComponentName, java.lang.String);
method public android.app.admin.DevicePolicyManager getParentProfileInstance(android.content.ComponentName);
method public long getPasswordExpiration(android.content.ComponentName);
@@ -5871,6 +5889,8 @@
method public boolean removeUser(android.content.ComponentName, android.os.UserHandle);
method public boolean requestBugreport(android.content.ComponentName);
method public boolean resetPassword(java.lang.String, int);
+ method public java.util.List<android.auditing.SecurityLog.SecurityEvent> retrieveDeviceLogs(android.content.ComponentName);
+ method public java.util.List<android.auditing.SecurityLog.SecurityEvent> retrievePreviousDeviceLogs(android.content.ComponentName);
method public void setAccountManagementDisabled(android.content.ComponentName, java.lang.String, boolean);
method public boolean setAlwaysOnVpnPackage(android.content.ComponentName, java.lang.String);
method public boolean setApplicationHidden(android.content.ComponentName, java.lang.String, boolean);
@@ -5882,6 +5902,7 @@
method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException;
method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);
method public void setCrossProfileContactsSearchDisabled(android.content.ComponentName, boolean);
+ method public void setDeviceLoggingEnabled(android.content.ComponentName, boolean);
method public boolean setDeviceOwnerLockScreenInfo(android.content.ComponentName, java.lang.String);
method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);
method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);
@@ -5892,6 +5913,7 @@
method public void setMaximumFailedPasswordsForWipe(android.content.ComponentName, int);
method public void setMaximumTimeToLock(android.content.ComponentName, long);
method public void setOrganizationColor(android.content.ComponentName, int);
+ method public void setOrganizationName(android.content.ComponentName, java.lang.String);
method public boolean setPackageSuspended(android.content.ComponentName, java.lang.String, boolean);
method public void setPasswordExpirationTimeout(android.content.ComponentName, long);
method public void setPasswordHistoryLength(android.content.ComponentName, int);
@@ -6303,7 +6325,6 @@
public static class NetworkStats.Bucket {
ctor public NetworkStats.Bucket();
method public long getEndTimeStamp();
- method public int getMetering();
method public int getRoaming();
method public long getRxBytes();
method public long getRxPackets();
@@ -6312,9 +6333,6 @@
method public long getTxBytes();
method public long getTxPackets();
method public int getUid();
- field public static final int METERING_ALL = -1; // 0xffffffff
- field public static final int METERING_DEFAULT = 1; // 0x1
- field public static final int METERING_METERED = 2; // 0x2
field public static final int ROAMING_ALL = -1; // 0xffffffff
field public static final int ROAMING_DEFAULT = 1; // 0x1
field public static final int ROAMING_ROAMING = 2; // 0x2
@@ -7925,6 +7943,7 @@
method public abstract java.lang.String[] databaseList();
method public abstract boolean deleteDatabase(java.lang.String);
method public abstract boolean deleteFile(java.lang.String);
+ method public abstract boolean deleteSharedPreferences(java.lang.String);
method public abstract void enforceCallingOrSelfPermission(java.lang.String, java.lang.String);
method public abstract void enforceCallingOrSelfUriPermission(android.net.Uri, int, java.lang.String);
method public abstract void enforceCallingPermission(java.lang.String, java.lang.String);
@@ -7978,6 +7997,8 @@
method public abstract void grantUriPermission(java.lang.String, android.net.Uri, int);
method public abstract boolean isDeviceEncryptedStorage();
method public boolean isRestricted();
+ method public abstract boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
+ method public abstract boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
method public final android.content.res.TypedArray obtainStyledAttributes(int[]);
method public final android.content.res.TypedArray obtainStyledAttributes(int, int[]) throws android.content.res.Resources.NotFoundException;
method public final android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[]);
@@ -8115,6 +8136,7 @@
method public java.lang.String[] databaseList();
method public boolean deleteDatabase(java.lang.String);
method public boolean deleteFile(java.lang.String);
+ method public boolean deleteSharedPreferences(java.lang.String);
method public void enforceCallingOrSelfPermission(java.lang.String, java.lang.String);
method public void enforceCallingOrSelfUriPermission(android.net.Uri, int, java.lang.String);
method public void enforceCallingPermission(java.lang.String, java.lang.String);
@@ -8161,6 +8183,8 @@
method public deprecated int getWallpaperDesiredMinimumWidth();
method public void grantUriPermission(java.lang.String, android.net.Uri, int);
method public boolean isDeviceEncryptedStorage();
+ method public boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
+ method public boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
method public java.io.FileInputStream openFileInput(java.lang.String) throws java.io.FileNotFoundException;
method public java.io.FileOutputStream openFileOutput(java.lang.String, int) throws java.io.FileNotFoundException;
method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory);
@@ -8632,7 +8656,7 @@
field public static final int FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS = 8388608; // 0x800000
field public static final int FLAG_ACTIVITY_FORWARD_RESULT = 33554432; // 0x2000000
field public static final int FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY = 1048576; // 0x100000
- field public static final int FLAG_ACTIVITY_LAUNCH_TO_SIDE = 4096; // 0x1000
+ field public static final int FLAG_ACTIVITY_LAUNCH_ADJACENT = 4096; // 0x1000
field public static final int FLAG_ACTIVITY_MULTIPLE_TASK = 134217728; // 0x8000000
field public static final int FLAG_ACTIVITY_NEW_DOCUMENT = 524288; // 0x80000
field public static final int FLAG_ACTIVITY_NEW_TASK = 268435456; // 0x10000000
@@ -19882,6 +19906,7 @@
method public android.media.AudioDeviceInfo getRoutedDevice();
method public int getSampleRate();
method public int getState();
+ method public int getTimestamp(android.media.AudioTimestamp, int);
method public int read(byte[], int, int);
method public int read(byte[], int, int, int);
method public int read(short[], int, int);
@@ -19953,6 +19978,8 @@
public final class AudioTimestamp {
ctor public AudioTimestamp();
+ field public static final int TIMEBASE_BOOTTIME = 1; // 0x1
+ field public static final int TIMEBASE_MONOTONIC = 0; // 0x0
field public long framePosition;
field public long nanoTime;
}
@@ -22507,6 +22534,7 @@
method public void setRatingType(int);
method public void setSessionActivity(android.app.PendingIntent);
field public static final int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1
+ field public static final int FLAG_HANDLES_PREPARE_ONLY = 4; // 0x4
field public static final int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2
}
@@ -22585,6 +22613,7 @@
field public static final long ACTION_SKIP_TO_QUEUE_ITEM = 4096L; // 0x1000L
field public static final long ACTION_STOP = 1L; // 0x1L
field public static final android.os.Parcelable.Creator<android.media.session.PlaybackState> CREATOR;
+ field public static final java.lang.String EXTRA_PREPARE_ONLY = "android.media.session.extra.PREPARE_ONLY";
field public static final long PLAYBACK_POSITION_UNKNOWN = -1L; // 0xffffffffffffffffL
field public static final int STATE_BUFFERING = 6; // 0x6
field public static final int STATE_CONNECTING = 8; // 0x8
@@ -22901,7 +22930,8 @@
method public void onInputAdded(java.lang.String);
method public void onInputRemoved(java.lang.String);
method public void onInputStateChanged(java.lang.String, int);
- method public void onTvInputInfoChanged(java.lang.String, android.media.tv.TvInputInfo);
+ method public void onInputUpdated(java.lang.String);
+ method public void onTvInputInfoChanged(android.media.tv.TvInputInfo);
}
public abstract class TvInputService extends android.app.Service {
@@ -22909,7 +22939,7 @@
method public final android.os.IBinder onBind(android.content.Intent);
method public android.media.tv.TvInputService.RecordingSession onCreateRecordingSession(java.lang.String);
method public abstract android.media.tv.TvInputService.Session onCreateSession(java.lang.String);
- method public final void setTvInputInfo(java.lang.String, android.media.tv.TvInputInfo);
+ method public static final void setTvInputInfo(android.content.Context, android.media.tv.TvInputInfo);
field public static final java.lang.String SERVICE_INTERFACE = "android.media.tv.TvInputService";
field public static final java.lang.String SERVICE_META_DATA = "android.media.tv.input";
}
@@ -22980,7 +23010,7 @@
method public void stopRecording();
}
- public class TvRecordingClient.RecordingCallback {
+ public static abstract class TvRecordingClient.RecordingCallback {
ctor public TvRecordingClient.RecordingCallback();
method public void onConnected();
method public void onDisconnected();
@@ -28547,6 +28577,10 @@
field public static final int OPEN = 32; // 0x20
}
+ public class FileUriExposedException extends java.lang.RuntimeException {
+ ctor public FileUriExposedException(java.lang.String);
+ }
+
public class Handler {
ctor public Handler();
ctor public Handler(android.os.Handler.Callback);
@@ -29138,6 +29172,7 @@
method public android.os.StrictMode.VmPolicy.Builder detectLeakedSqlLiteObjects();
method public android.os.StrictMode.VmPolicy.Builder penaltyDeath();
method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnCleartextNetwork();
+ method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnFileUriExposure();
method public android.os.StrictMode.VmPolicy.Builder penaltyDropBox();
method public android.os.StrictMode.VmPolicy.Builder penaltyLog();
method public android.os.StrictMode.VmPolicy.Builder setClassInstanceLimit(java.lang.Class, int);
@@ -29604,6 +29639,8 @@
method public static void setDefaultValues(android.content.Context, java.lang.String, int, int, boolean);
method public void setSharedPreferencesMode(int);
method public void setSharedPreferencesName(java.lang.String);
+ method public void setStorageDefault();
+ method public void setStorageDeviceEncrypted();
field public static final java.lang.String KEY_HAS_SET_DEFAULT_VALUES = "_has_set_default_values";
field public static final java.lang.String METADATA_KEY_PREFERENCES = "android.preference";
}
@@ -31655,6 +31692,7 @@
public abstract class DocumentsProvider extends android.content.ContentProvider {
ctor public DocumentsProvider();
+ method public java.lang.String copyDocument(java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public java.lang.String createDocument(java.lang.String, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public final int delete(android.net.Uri, java.lang.String, java.lang.String[]);
method public void deleteDocument(java.lang.String) throws java.io.FileNotFoundException;
@@ -31662,6 +31700,7 @@
method public final java.lang.String getType(android.net.Uri);
method public final android.net.Uri insert(android.net.Uri, android.content.ContentValues);
method public boolean isChildDocument(java.lang.String, java.lang.String);
+ method public java.lang.String moveDocument(java.lang.String, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public final android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
method public final android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
method public abstract android.os.ParcelFileDescriptor openDocument(java.lang.String, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
@@ -32057,6 +32096,7 @@
field public static final java.lang.String ACTION_INPUT_METHOD_SETTINGS = "android.settings.INPUT_METHOD_SETTINGS";
field public static final java.lang.String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS";
field public static final java.lang.String ACTION_INTERNAL_STORAGE_SETTINGS = "android.settings.INTERNAL_STORAGE_SETTINGS";
+ field public static final java.lang.String ACTION_KEYBOARD_LAYOUT_SETTINGS = "android.settings.KEYBOARD_LAYOUT_SETTINGS";
field public static final java.lang.String ACTION_LOCALE_SETTINGS = "android.settings.LOCALE_SETTINGS";
field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS";
field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";
@@ -37203,7 +37243,7 @@
method public void testActivityTestCaseSetUpProperly() throws java.lang.Exception;
}
- public abstract class ActivityInstrumentationTestCase2 extends android.test.ActivityTestCase {
+ public abstract deprecated class ActivityInstrumentationTestCase2 extends android.test.ActivityTestCase {
ctor public deprecated ActivityInstrumentationTestCase2(java.lang.String, java.lang.Class<T>);
ctor public ActivityInstrumentationTestCase2(java.lang.Class<T>);
method public T getActivity();
@@ -37211,14 +37251,14 @@
method public void setActivityIntent(android.content.Intent);
}
- public abstract class ActivityTestCase extends android.test.InstrumentationTestCase {
+ public abstract deprecated class ActivityTestCase extends android.test.InstrumentationTestCase {
ctor public ActivityTestCase();
method protected android.app.Activity getActivity();
method protected void scrubClass(java.lang.Class<?>) throws java.lang.IllegalAccessException;
method protected void setActivity(android.app.Activity);
}
- public abstract class ActivityUnitTestCase extends android.test.ActivityTestCase {
+ public abstract deprecated class ActivityUnitTestCase extends android.test.ActivityTestCase {
ctor public ActivityUnitTestCase(java.lang.Class<T>);
method public T getActivity();
method public int getFinishedActivityRequest();
@@ -37231,7 +37271,7 @@
method protected T startActivity(android.content.Intent, android.os.Bundle, java.lang.Object);
}
- public class AndroidTestCase extends junit.framework.TestCase {
+ public deprecated class AndroidTestCase extends junit.framework.TestCase {
ctor public AndroidTestCase();
method public void assertActivityRequiresPermission(java.lang.String, java.lang.String, java.lang.String);
method public void assertReadingContentUriRequiresPermission(android.net.Uri, java.lang.String);
@@ -37243,7 +37283,7 @@
field protected android.content.Context mContext;
}
- public class AndroidTestRunner extends junit.runner.BaseTestRunner {
+ public deprecated class AndroidTestRunner extends junit.runner.BaseTestRunner {
ctor public AndroidTestRunner();
method public void addTestListener(junit.framework.TestListener);
method public void clearTestListeners();
@@ -37264,7 +37304,7 @@
method public void testStarted(java.lang.String);
}
- public abstract class ApplicationTestCase extends android.test.AndroidTestCase {
+ public abstract deprecated class ApplicationTestCase extends android.test.AndroidTestCase {
ctor public ApplicationTestCase(java.lang.Class<T>);
method protected final void createApplication();
method public T getApplication();
@@ -37282,10 +37322,10 @@
ctor public ComparisonFailure(java.lang.String, java.lang.String, java.lang.String);
}
- public abstract class FlakyTest implements java.lang.annotation.Annotation {
+ public abstract deprecated class FlakyTest implements java.lang.annotation.Annotation {
}
- public class InstrumentationTestCase extends junit.framework.TestCase {
+ public deprecated class InstrumentationTestCase extends junit.framework.TestCase {
ctor public InstrumentationTestCase();
method public android.app.Instrumentation getInstrumentation();
method public deprecated void injectInsrumentation(android.app.Instrumentation);
@@ -37298,7 +37338,7 @@
method public void sendRepeatedKeys(int...);
}
- public class InstrumentationTestRunner extends android.app.Instrumentation implements android.test.TestSuiteProvider {
+ public deprecated class InstrumentationTestRunner extends android.app.Instrumentation implements android.test.TestSuiteProvider {
ctor public InstrumentationTestRunner();
method public junit.framework.TestSuite getAllTests();
method protected android.test.AndroidTestRunner getAndroidTestRunner();
@@ -37317,14 +37357,14 @@
field public static final int REPORT_VALUE_RESULT_START = 1; // 0x1
}
- public class InstrumentationTestSuite extends junit.framework.TestSuite {
+ public deprecated class InstrumentationTestSuite extends junit.framework.TestSuite {
ctor public InstrumentationTestSuite(android.app.Instrumentation);
ctor public InstrumentationTestSuite(java.lang.String, android.app.Instrumentation);
ctor public InstrumentationTestSuite(java.lang.Class, android.app.Instrumentation);
method public void addTestSuite(java.lang.Class);
}
- public class IsolatedContext extends android.content.ContextWrapper {
+ public deprecated class IsolatedContext extends android.content.ContextWrapper {
ctor public IsolatedContext(android.content.ContentResolver, android.content.Context);
method public java.util.List<android.content.Intent> getAndClearBroadcastIntents();
}
@@ -37334,7 +37374,7 @@
method public T getLoaderResultSynchronously(android.content.Loader<T>);
}
- public final class MoreAsserts {
+ public final deprecated class MoreAsserts {
method public static void assertAssignableFrom(java.lang.Class<?>, java.lang.Object);
method public static void assertAssignableFrom(java.lang.Class<?>, java.lang.Class<?>);
method public static java.util.regex.MatchResult assertContainsRegex(java.lang.String, java.lang.String, java.lang.String);
@@ -37373,7 +37413,7 @@
method public static void checkEqualsAndHashCodeMethods(java.lang.Object, java.lang.Object, boolean);
}
- public abstract interface PerformanceTestCase {
+ public abstract deprecated interface PerformanceTestCase {
method public abstract boolean isPerformanceOnly();
method public abstract int startPerformance(android.test.PerformanceTestCase.Intermediates);
}
@@ -37402,7 +37442,7 @@
method public static android.content.ContentResolver newResolverWithContentProviderFromSql(android.content.Context, java.lang.String, java.lang.Class<T>, java.lang.String, java.lang.String, int, java.lang.String) throws java.lang.IllegalAccessException, java.lang.InstantiationException;
}
- public class RenamingDelegatingContext extends android.content.ContextWrapper {
+ public deprecated class RenamingDelegatingContext extends android.content.ContextWrapper {
ctor public RenamingDelegatingContext(android.content.Context, java.lang.String);
ctor public RenamingDelegatingContext(android.content.Context, android.content.Context, java.lang.String);
method public java.lang.String getDatabasePrefix();
@@ -37411,7 +37451,7 @@
method public static T providerWithRenamedContext(java.lang.Class<T>, android.content.Context, java.lang.String, boolean) throws java.lang.IllegalAccessException, java.lang.InstantiationException;
}
- public abstract class ServiceTestCase extends android.test.AndroidTestCase {
+ public abstract deprecated class ServiceTestCase extends android.test.AndroidTestCase {
ctor public ServiceTestCase(java.lang.Class<T>);
method protected android.os.IBinder bindService(android.content.Intent);
method public android.app.Application getApplication();
@@ -37424,23 +37464,23 @@
method public void testServiceTestCaseSetUpProperly() throws java.lang.Exception;
}
- public abstract class SingleLaunchActivityTestCase extends android.test.InstrumentationTestCase {
+ public abstract deprecated class SingleLaunchActivityTestCase extends android.test.InstrumentationTestCase {
ctor public SingleLaunchActivityTestCase(java.lang.String, java.lang.Class<T>);
method public T getActivity();
method public void testActivityTestCaseSetUpProperly() throws java.lang.Exception;
}
- public class SyncBaseInstrumentation extends android.test.InstrumentationTestCase {
+ public deprecated class SyncBaseInstrumentation extends android.test.InstrumentationTestCase {
ctor public SyncBaseInstrumentation();
method protected void cancelSyncsandDisableAutoSync();
method protected void syncProvider(android.net.Uri, java.lang.String, java.lang.String) throws java.lang.Exception;
}
- public abstract interface TestSuiteProvider {
+ public abstract deprecated interface TestSuiteProvider {
method public abstract junit.framework.TestSuite getTestSuite();
}
- public class TouchUtils {
+ public deprecated class TouchUtils {
ctor public TouchUtils();
method public static void clickView(android.test.InstrumentationTestCase, android.view.View);
method public static deprecated void drag(android.test.ActivityInstrumentationTestCase, float, float, float, float, int);
@@ -37475,10 +37515,10 @@
method public static void touchAndCancelView(android.test.InstrumentationTestCase, android.view.View);
}
- public abstract class UiThreadTest implements java.lang.annotation.Annotation {
+ public abstract deprecated class UiThreadTest implements java.lang.annotation.Annotation {
}
- public class ViewAsserts {
+ public deprecated class ViewAsserts {
method public static void assertBaselineAligned(android.view.View, android.view.View);
method public static void assertBottomAligned(android.view.View, android.view.View);
method public static void assertBottomAligned(android.view.View, android.view.View, int);
@@ -37503,11 +37543,11 @@
package android.test.mock {
- public class MockApplication extends android.app.Application {
+ public deprecated class MockApplication extends android.app.Application {
ctor public MockApplication();
}
- public class MockContentProvider extends android.content.ContentProvider {
+ public deprecated class MockContentProvider extends android.content.ContentProvider {
ctor protected MockContentProvider();
ctor public MockContentProvider(android.content.Context);
ctor public MockContentProvider(android.content.Context, java.lang.String, java.lang.String, android.content.pm.PathPermission[]);
@@ -37519,13 +37559,13 @@
method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]);
}
- public class MockContentResolver extends android.content.ContentResolver {
+ public deprecated class MockContentResolver extends android.content.ContentResolver {
ctor public MockContentResolver();
ctor public MockContentResolver(android.content.Context);
method public void addProvider(java.lang.String, android.content.ContentProvider);
}
- public class MockContext extends android.content.Context {
+ public deprecated class MockContext extends android.content.Context {
ctor public MockContext();
method public boolean bindService(android.content.Intent, android.content.ServiceConnection, int);
method public int checkCallingOrSelfPermission(java.lang.String);
@@ -37544,6 +37584,7 @@
method public java.lang.String[] databaseList();
method public boolean deleteDatabase(java.lang.String);
method public boolean deleteFile(java.lang.String);
+ method public boolean deleteSharedPreferences(java.lang.String);
method public void enforceCallingOrSelfPermission(java.lang.String, java.lang.String);
method public void enforceCallingOrSelfUriPermission(android.net.Uri, int, java.lang.String);
method public void enforceCallingPermission(java.lang.String, java.lang.String);
@@ -37589,6 +37630,8 @@
method public int getWallpaperDesiredMinimumWidth();
method public void grantUriPermission(java.lang.String, android.net.Uri, int);
method public boolean isDeviceEncryptedStorage();
+ method public boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
+ method public boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
method public java.io.FileInputStream openFileInput(java.lang.String) throws java.io.FileNotFoundException;
method public java.io.FileOutputStream openFileOutput(java.lang.String, int) throws java.io.FileNotFoundException;
method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory);
@@ -37626,7 +37669,7 @@
method public void unregisterReceiver(android.content.BroadcastReceiver);
}
- public class MockCursor implements android.database.Cursor {
+ public deprecated class MockCursor implements android.database.Cursor {
ctor public MockCursor();
method public void close();
method public void copyStringToBuffer(int, android.database.CharArrayBuffer);
@@ -37671,13 +37714,13 @@
method public void unregisterDataSetObserver(android.database.DataSetObserver);
}
- public class MockDialogInterface implements android.content.DialogInterface {
+ public deprecated class MockDialogInterface implements android.content.DialogInterface {
ctor public MockDialogInterface();
method public void cancel();
method public void dismiss();
}
- public class MockPackageManager extends android.content.pm.PackageManager {
+ public deprecated class MockPackageManager extends android.content.pm.PackageManager {
ctor public MockPackageManager();
method public void addPackageToPreferred(java.lang.String);
method public boolean addPermission(android.content.pm.PermissionInfo);
@@ -37765,7 +37808,7 @@
method public void verifyPendingInstall(int, int);
}
- public class MockResources extends android.content.res.Resources {
+ public deprecated class MockResources extends android.content.res.Resources {
ctor public MockResources();
}
@@ -37806,19 +37849,19 @@
package android.test.suitebuilder.annotation {
- public abstract class LargeTest implements java.lang.annotation.Annotation {
+ public abstract deprecated class LargeTest implements java.lang.annotation.Annotation {
}
- public abstract class MediumTest implements java.lang.annotation.Annotation {
+ public abstract deprecated class MediumTest implements java.lang.annotation.Annotation {
}
- public abstract class SmallTest implements java.lang.annotation.Annotation {
+ public abstract deprecated class SmallTest implements java.lang.annotation.Annotation {
}
- public abstract class Smoke implements java.lang.annotation.Annotation {
+ public abstract deprecated class Smoke implements java.lang.annotation.Annotation {
}
- public abstract class Suppress implements java.lang.annotation.Annotation {
+ public abstract deprecated class Suppress implements java.lang.annotation.Annotation {
}
}
@@ -39872,6 +39915,7 @@
field public static final int DENSITY_420 = 420; // 0x1a4
field public static final int DENSITY_560 = 560; // 0x230
field public static final int DENSITY_DEFAULT = 160; // 0xa0
+ field public static final int DENSITY_DEVICE_STABLE;
field public static final int DENSITY_HIGH = 240; // 0xf0
field public static final int DENSITY_LOW = 120; // 0x78
field public static final int DENSITY_MEDIUM = 160; // 0xa0
@@ -51317,6 +51361,9 @@
public abstract class Inherited implements java.lang.annotation.Annotation {
}
+ public abstract class Repeatable implements java.lang.annotation.Annotation {
+ }
+
public abstract class Retention implements java.lang.annotation.Annotation {
}
@@ -61976,6 +62023,7 @@
ctor public ExtendedSSLSession();
method public abstract java.lang.String[] getLocalSupportedSignatureAlgorithms();
method public abstract java.lang.String[] getPeerSupportedSignatureAlgorithms();
+ method public java.util.List<javax.net.ssl.SNIServerName> getRequestedServerNames();
}
public class HandshakeCompletedEvent extends java.util.EventObject {
@@ -62048,6 +62096,25 @@
public abstract interface ManagerFactoryParameters {
}
+ public final class SNIHostName extends javax.net.ssl.SNIServerName {
+ ctor public SNIHostName(java.lang.String);
+ ctor public SNIHostName(byte[]);
+ method public static javax.net.ssl.SNIMatcher createSNIMatcher(java.lang.String);
+ method public java.lang.String getAsciiName();
+ }
+
+ public abstract class SNIMatcher {
+ ctor protected SNIMatcher(int);
+ method public final int getType();
+ method public abstract boolean matches(javax.net.ssl.SNIServerName);
+ }
+
+ public abstract class SNIServerName {
+ ctor protected SNIServerName(int, byte[]);
+ method public final byte[] getEncoded();
+ method public final int getType();
+ }
+
public class SSLContext {
ctor protected SSLContext(javax.net.ssl.SSLContextSpi, java.security.Provider, java.lang.String);
method public final javax.net.ssl.SSLEngine createSSLEngine();
@@ -62169,12 +62236,18 @@
method public java.lang.String getEndpointIdentificationAlgorithm();
method public boolean getNeedClientAuth();
method public java.lang.String[] getProtocols();
+ method public final java.util.Collection<javax.net.ssl.SNIMatcher> getSNIMatchers();
+ method public final java.util.List<javax.net.ssl.SNIServerName> getServerNames();
+ method public final boolean getUseCipherSuitesOrder();
method public boolean getWantClientAuth();
method public void setAlgorithmConstraints(java.security.AlgorithmConstraints);
method public void setCipherSuites(java.lang.String[]);
method public void setEndpointIdentificationAlgorithm(java.lang.String);
method public void setNeedClientAuth(boolean);
method public void setProtocols(java.lang.String[]);
+ method public final void setSNIMatchers(java.util.Collection<javax.net.ssl.SNIMatcher>);
+ method public final void setServerNames(java.util.List<javax.net.ssl.SNIServerName>);
+ method public final void setUseCipherSuitesOrder(boolean);
method public void setWantClientAuth(boolean);
}
@@ -62302,6 +62375,10 @@
method public abstract java.lang.String[] getSupportedCipherSuites();
}
+ public final class StandardConstants {
+ field public static final int SNI_HOST_NAME = 0; // 0x0
+ }
+
public abstract interface TrustManager {
}
diff --git a/api/test-removed.txt b/api/test-removed.txt
index 6b7961e..2c6729d 100644
--- a/api/test-removed.txt
+++ b/api/test-removed.txt
@@ -201,7 +201,7 @@
package android.test.mock {
- public class MockPackageManager extends android.content.pm.PackageManager {
+ public deprecated class MockPackageManager extends android.content.pm.PackageManager {
method public deprecated java.lang.String getDefaultBrowserPackageName(int);
method public deprecated boolean setDefaultBrowserPackageName(java.lang.String, int);
}
diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java
index 72e8c3b..ba93b2a 100644
--- a/cmds/am/src/com/android/commands/am/Am.java
+++ b/cmds/am/src/com/android/commands/am/Am.java
@@ -47,7 +47,6 @@
import android.content.pm.UserInfo;
import android.content.res.Configuration;
import android.graphics.Rect;
-import android.net.Uri;
import android.os.Binder;
import android.os.Build;
import android.os.Bundle;
@@ -79,7 +78,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.HashSet;
import java.util.List;
public class Am extends BaseCommand {
@@ -159,6 +157,7 @@
" am stack start <DISPLAY_ID> <INTENT>\n" +
" am stack movetask <TASK_ID> <STACK_ID> [true|false]\n" +
" am stack resize <STACK_ID> <LEFT,TOP,RIGHT,BOTTOM>\n" +
+ " am stack resize-animated <STACK_ID> <LEFT,TOP,RIGHT,BOTTOM>\n" +
" am stack resize-docked-stack <LEFT,TOP,RIGHT,BOTTOM> [<TASK_LEFT,TASK_TOP,TASK_RIGHT,TASK_BOTTOM>]\n" +
" am stack size-docked-stack-test: <STEP_SIZE> <l|t|r|b> [DELAY_MS]\n" +
" am stack move-top-activity-to-pinned-stack: <STACK_ID> <LEFT,TOP,RIGHT,BOTTOM>\n" +
@@ -167,7 +166,7 @@
" am stack info <STACK_ID>\n" +
" am task lock <TASK_ID>\n" +
" am task lock stop\n" +
- " am task resizeable <TASK_ID> [true|false]\n" +
+ " am task resizeable <TASK_ID> [0 (unresizeable) | 1 (crop_windows) | 2 (resizeable) | 3 (resizeable_and_pipable)]\n" +
" am task resize <TASK_ID> <LEFT,TOP,RIGHT,BOTTOM>\n" +
" am task drag-task-test <TASK_ID> <STEP_SIZE> [DELAY_MS] \n" +
" am task size-task-test <TASK_ID> <STEP_SIZE> [DELAY_MS] \n" +
@@ -324,7 +323,8 @@
"\n" +
"am task lock stop: end the current task lock.\n" +
"\n" +
- "am task resizeable: change if <TASK_ID> is resizeable (true) or not (false).\n" +
+ "am task resizeable: change resizeable mode of <TASK_ID>.\n" +
+ " 0 (unresizeable) | 1 (crop_windows) | 2 (resizeable) | 3 (resizeable_and_pipable)\n" +
"\n" +
"am task resize: makes sure <TASK_ID> is in a stack with the specified bounds.\n" +
" Forces the task to be resizeable and creates a stack if no existing stack\n" +
@@ -1688,6 +1688,9 @@
case "resize":
runStackResize();
break;
+ case "resize-animated":
+ runStackResizeAnimated();
+ break;
case "resize-docked-stack":
runStackResizeDocked();
break;
@@ -1756,7 +1759,18 @@
System.err.println("Error: invalid input bounds");
return;
}
- resizeStack(stackId, bounds, 0);
+ resizeStack(stackId, bounds, 0, false);
+ }
+
+ private void runStackResizeAnimated() throws Exception {
+ String stackIdStr = nextArgRequired();
+ int stackId = Integer.valueOf(stackIdStr);
+ final Rect bounds = getBounds();
+ if (bounds == null) {
+ System.err.println("Error: invalid input bounds");
+ return;
+ }
+ resizeStack(stackId, bounds, 0, true);
}
private void runStackResizeDocked() throws Exception {
@@ -1773,14 +1787,15 @@
}
}
- private void resizeStack(int stackId, Rect bounds, int delayMs) throws Exception {
+ private void resizeStack(int stackId, Rect bounds, int delayMs, boolean animate)
+ throws Exception {
if (bounds == null) {
showError("Error: invalid input bounds");
return;
}
try {
- mAm.resizeStack(stackId, bounds, false);
+ mAm.resizeStack(stackId, bounds, false, false, animate);
Thread.sleep(delayMs);
} catch (RemoteException e) {
showError("Error: resizing stack " + e);
@@ -1894,7 +1909,7 @@
maxChange = Math.min(stepSize, currentPoint - minPoint);
currentPoint -= maxChange;
setBoundsSide(bounds, side, currentPoint);
- resizeStack(DOCKED_STACK_ID, bounds, delayMs);
+ resizeStack(DOCKED_STACK_ID, bounds, delayMs, false);
}
System.out.println("Growing docked stack side=" + side);
@@ -1902,7 +1917,7 @@
maxChange = Math.min(stepSize, maxPoint - currentPoint);
currentPoint += maxChange;
setBoundsSide(bounds, side, currentPoint);
- resizeStack(DOCKED_STACK_ID, bounds, delayMs);
+ resizeStack(DOCKED_STACK_ID, bounds, delayMs, false);
}
System.out.println("Back to Original size side=" + side);
@@ -1910,7 +1925,7 @@
maxChange = Math.min(stepSize, currentPoint - startPoint);
currentPoint -= maxChange;
setBoundsSide(bounds, side, currentPoint);
- resizeStack(DOCKED_STACK_ID, bounds, delayMs);
+ resizeStack(DOCKED_STACK_ID, bounds, delayMs, false);
}
}
@@ -1971,10 +1986,10 @@
final String taskIdStr = nextArgRequired();
final int taskId = Integer.valueOf(taskIdStr);
final String resizeableStr = nextArgRequired();
- final boolean resizeable = Boolean.valueOf(resizeableStr);
+ final int resizeableMode = Integer.valueOf(resizeableStr);
try {
- mAm.setTaskResizeable(taskId, resizeable);
+ mAm.setTaskResizeable(taskId, resizeableMode);
} catch (RemoteException e) {
}
}
diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java
index 8bc17f8..c96cca2 100644
--- a/core/java/android/accessibilityservice/AccessibilityService.java
+++ b/core/java/android/accessibilityservice/AccessibilityService.java
@@ -17,6 +17,7 @@
package android.accessibilityservice;
import android.accessibilityservice.GestureDescription.MotionEventGenerator;
+import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.Service;
@@ -29,6 +30,7 @@
import android.os.Looper;
import android.os.Message;
import android.os.RemoteException;
+import android.provider.Settings;
import android.util.ArrayMap;
import android.util.Log;
import android.util.Pair;
@@ -46,10 +48,13 @@
import com.android.internal.os.HandlerCaller;
import com.android.internal.os.SomeArgs;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.util.List;
/**
- * An accessibility service runs in the background and receives callbacks by the system
+ * Accessibility services are intended to assist users with disabilities in using
+ * Android devices and apps. They run in the background and receive callbacks by the system
* when {@link AccessibilityEvent}s are fired. Such events denote some state transition
* in the user interface, for example, the focus has changed, a button has been clicked,
* etc. Such a service can optionally request the capability for querying the content
@@ -66,22 +71,31 @@
* <h3>Lifecycle</h3>
* <p>
* The lifecycle of an accessibility service is managed exclusively by the system and
- * follows the established service life cycle. Additionally, starting or stopping an
- * accessibility service is triggered exclusively by an explicit user action through
- * enabling or disabling it in the device settings. After the system binds to a service it
- * calls {@link AccessibilityService#onServiceConnected()}. This method can be
- * overriden by clients that want to perform post binding setup.
+ * follows the established service life cycle. Starting an accessibility service is triggered
+ * exclusively by the user explicitly turning the service on in device settings. After the system
+ * binds to a service, it calls {@link AccessibilityService#onServiceConnected()}. This method can
+ * be overriden by clients that want to perform post binding setup.
+ * </p>
+ * <p>
+ * An accessibility service stops either when the user turns it off in device settings or when
+ * it calls {@link AccessibilityService#disableSelf()}.
* </p>
* <h3>Declaration</h3>
* <p>
- * An accessibility is declared as any other service in an AndroidManifest.xml but it
- * must also specify that it handles the "android.accessibilityservice.AccessibilityService"
- * {@link android.content.Intent}. Failure to declare this intent will cause the system to
- * ignore the accessibility service. Additionally an accessibility service must request the
- * {@link android.Manifest.permission#BIND_ACCESSIBILITY_SERVICE} permission to ensure
- * that only the system
- * can bind to it. Failure to declare this intent will cause the system to ignore the
- * accessibility service. Following is an example declaration:
+ * An accessibility is declared as any other service in an AndroidManifest.xml, but it
+ * must do two things:
+ * <ul>
+ * <ol>
+ * Specify that it handles the "android.accessibilityservice.AccessibilityService"
+ * {@link android.content.Intent}.
+ * </ol>
+ * <ol>
+ * Request the {@link android.Manifest.permission#BIND_ACCESSIBILITY_SERVICE} permission to
+ * ensure that only the system can bind to it.
+ * </ol>
+ * </ul>
+ * If either of these items is missing, the system will ignore the accessibility service.
+ * Following is an example declaration:
* </p>
* <pre> <service android:name=".MyAccessibilityService"
* android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
@@ -135,48 +149,24 @@
* </ul>
* <h3>Retrieving window content</h3>
* <p>
- * A service can specify in its declaration that it can retrieve the active window
- * content which is represented as a tree of {@link AccessibilityNodeInfo}. Note that
+ * A service can specify in its declaration that it can retrieve window
+ * content which is represented as a tree of {@link AccessibilityWindowInfo} and
+ * {@link AccessibilityNodeInfo} objects. Note that
* declaring this capability requires that the service declares its configuration via
* an XML resource referenced by {@link #SERVICE_META_DATA}.
* </p>
* <p>
- * For security purposes an accessibility service can retrieve only the content of the
- * currently active window. The currently active window is defined as the window from
- * which was fired the last event of the following types:
- * {@link AccessibilityEvent#TYPE_WINDOW_STATE_CHANGED},
- * {@link AccessibilityEvent#TYPE_VIEW_HOVER_ENTER},
- * {@link AccessibilityEvent#TYPE_VIEW_HOVER_EXIT},
- * In other words, the last window that was shown or the last window that the user has touched
- * during touch exploration.
- * </p>
- * <p>
- * The entry point for retrieving window content is through calling
- * {@link AccessibilityEvent#getSource() AccessibilityEvent.getSource()} of the last received
- * event of the above types or a previous event from the same window
- * (see {@link AccessibilityEvent#getWindowId() AccessibilityEvent.getWindowId()}). Invoking
- * this method will return an {@link AccessibilityNodeInfo} that can be used to traverse the
- * window content which represented as a tree of such objects.
+ * Window content may be retrieved with
+ * {@link AccessibilityEvent#getSource() AccessibilityEvent.getSource()},
+ * {@link AccessibilityService#findFocus(int)},
+ * {@link AccessibilityService#getWindows()}, or
+ * {@link AccessibilityService#getRootInActiveWindow()}.
* </p>
* <p class="note">
* <strong>Note</strong> An accessibility service may have requested to be notified for
- * a subset of the event types, thus be unaware that the active window has changed. Therefore
- * accessibility service that would like to retrieve window content should:
- * <ul>
- * <li>
- * Register for all event types with no notification timeout and keep track for the active
- * window by calling {@link AccessibilityEvent#getWindowId()} of the last received event and
- * compare this with the {@link AccessibilityNodeInfo#getWindowId()} before calling retrieval
- * methods on the latter.
- * </li>
- * <li>
- * Prepare that a retrieval method on {@link AccessibilityNodeInfo} may fail since the
- * active window has changed and the service did not get the accessibility event yet. Note
- * that it is possible to have a retrieval method failing even adopting the strategy
- * specified in the previous bullet because the accessibility event dispatch is asynchronous
- * and crosses process boundaries.
- * </li>
- * </ul>
+ * a subset of the event types, and thus be unaware when the node hierarchy has changed. It is also
+ * possible for a node to contain outdated information because the window content may change at any
+ * time.
* </p>
* <h3>Notification strategy</h3>
* <p>
@@ -328,7 +318,6 @@
* android:settingsActivity="foo.bar.TestBackActivity"
* android:canRetrieveWindowContent="true"
* android:canRequestTouchExplorationMode="true"
- * android:canRequestEnhancedWebAccessibility="true"
* . . .
* /></pre>
*/
@@ -378,9 +367,26 @@
public boolean onKeyEvent(KeyEvent event);
public void onMagnificationChanged(@NonNull Region region,
float scale, float centerX, float centerY);
+ public void onSoftKeyboardShowModeChanged(int showMode);
public void onPerformGestureResult(int sequence, boolean completedSuccessfully);
}
+ /**
+ * Annotations for Soft Keyboard show modes so tools can catch invalid show modes.
+ * @hide
+ */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({SHOW_MODE_AUTO, SHOW_MODE_HIDDEN})
+ public @interface SoftKeyboardShowMode {};
+ /**
+ * @hide
+ */
+ public static final int SHOW_MODE_AUTO = 0;
+ /**
+ * @hide
+ */
+ public static final int SHOW_MODE_HIDDEN = 1;
+
private int mConnectionId;
private AccessibilityServiceInfo mInfo;
@@ -390,6 +396,7 @@
private WindowManager mWindowManager;
private MagnificationController mMagnificationController;
+ private SoftKeyboardController mSoftKeyboardController;
private int mGestureStatusCallbackSequence;
@@ -528,6 +535,14 @@
* is currently touching or the window with input focus, if the user is not
* touching any window.
* <p>
+ * The currently active window is defined as the window that most recently fired one
+ * of the following events:
+ * {@link AccessibilityEvent#TYPE_WINDOW_STATE_CHANGED},
+ * {@link AccessibilityEvent#TYPE_VIEW_HOVER_ENTER},
+ * {@link AccessibilityEvent#TYPE_VIEW_HOVER_EXIT}.
+ * In other words, the last window shown that also has input focus.
+ * </p>
+ * <p>
* <strong>Note:</strong> In order to access the root node your service has
* to declare the capability to retrieve window content by setting the
* {@link android.R.styleable#AccessibilityService_canRetrieveWindowContent}
@@ -541,8 +556,8 @@
}
/**
- * This method allows accessibility service turn itself off
- * and the service will become disabled from the Settings.
+ * Disables the service. After calling this method, the service will be disabled and settings
+ * will show that it is turned off.
*/
public final void disableSelf() {
final IAccessibilityServiceConnection connection =
@@ -570,10 +585,12 @@
*/
@NonNull
public final MagnificationController getMagnificationController() {
- if (mMagnificationController == null) {
- mMagnificationController = new MagnificationController(this);
+ synchronized (mLock) {
+ if (mMagnificationController == null) {
+ mMagnificationController = new MagnificationController(this, mLock);
+ }
+ return mMagnificationController;
}
- return mMagnificationController;
}
/**
@@ -677,17 +694,21 @@
* first magnification listener.
*/
private ArrayMap<OnMagnificationChangedListener, Handler> mListeners;
+ private final Object mLock;
- MagnificationController(@NonNull AccessibilityService service) {
+ MagnificationController(@NonNull AccessibilityService service, @NonNull Object lock) {
mService = service;
+ mLock = lock;
}
/**
* Called when the service is connected.
*/
void onServiceConnected() {
- if (mListeners != null && !mListeners.isEmpty()) {
- setMagnificationCallbackEnabled(true);
+ synchronized (mLock) {
+ if (mListeners != null && !mListeners.isEmpty()) {
+ setMagnificationCallbackEnabled(true);
+ }
}
}
@@ -714,17 +735,19 @@
*/
public void addListener(@NonNull OnMagnificationChangedListener listener,
@Nullable Handler handler) {
- if (mListeners == null) {
- mListeners = new ArrayMap<>();
- }
+ synchronized (mLock) {
+ if (mListeners == null) {
+ mListeners = new ArrayMap<>();
+ }
- final boolean shouldEnableCallback = mListeners.isEmpty();
- mListeners.put(listener, handler);
+ final boolean shouldEnableCallback = mListeners.isEmpty();
+ mListeners.put(listener, handler);
- if (shouldEnableCallback) {
- // This may fail if the service is not connected yet, but if we
- // still have listeners when it connects then we can try again.
- setMagnificationCallbackEnabled(true);
+ if (shouldEnableCallback) {
+ // This may fail if the service is not connected yet, but if we
+ // still have listeners when it connects then we can try again.
+ setMagnificationCallbackEnabled(true);
+ }
}
}
@@ -741,19 +764,21 @@
return false;
}
- final int keyIndex = mListeners.indexOfKey(listener);
- final boolean hasKey = keyIndex >= 0;
- if (hasKey) {
- mListeners.removeAt(keyIndex);
- }
+ synchronized (mLock) {
+ final int keyIndex = mListeners.indexOfKey(listener);
+ final boolean hasKey = keyIndex >= 0;
+ if (hasKey) {
+ mListeners.removeAt(keyIndex);
+ }
- if (hasKey && mListeners.isEmpty()) {
- // We just removed the last listener, so we don't need
- // callbacks from the service anymore.
- setMagnificationCallbackEnabled(false);
- }
+ if (hasKey && mListeners.isEmpty()) {
+ // We just removed the last listener, so we don't need
+ // callbacks from the service anymore.
+ setMagnificationCallbackEnabled(false);
+ }
- return hasKey;
+ return hasKey;
+ }
}
private void setMagnificationCallbackEnabled(boolean enabled) {
@@ -775,17 +800,19 @@
*/
void dispatchMagnificationChanged(final @NonNull Region region, final float scale,
final float centerX, final float centerY) {
- if (mListeners == null || mListeners.isEmpty()) {
- Slog.d(LOG_TAG, "Received magnification changed "
- + "callback with no listeners registered!");
- setMagnificationCallbackEnabled(false);
- return;
- }
+ final ArrayMap<OnMagnificationChangedListener, Handler> entries;
+ synchronized (mLock) {
+ if (mListeners == null || mListeners.isEmpty()) {
+ Slog.d(LOG_TAG, "Received magnification changed "
+ + "callback with no listeners registered!");
+ setMagnificationCallbackEnabled(false);
+ return;
+ }
- // Listeners may remove themselves. Perform a shallow copy to avoid
- // concurrent modification.
- final ArrayMap<OnMagnificationChangedListener, Handler> entries =
- new ArrayMap<>(mListeners);
+ // Listeners may remove themselves. Perform a shallow copy to avoid concurrent
+ // modification.
+ entries = new ArrayMap<>(mListeners);
+ }
for (int i = 0, count = entries.size(); i < count; i++) {
final OnMagnificationChangedListener listener = entries.keyAt(i);
@@ -1018,6 +1045,243 @@
}
/**
+ * Returns the soft keyboard controller, which may be used to query and modify the soft keyboard
+ * show mode.
+ *
+ * @return the soft keyboard controller
+ */
+ @NonNull
+ public final SoftKeyboardController getSoftKeyboardController() {
+ synchronized (mLock) {
+ if (mSoftKeyboardController == null) {
+ mSoftKeyboardController = new SoftKeyboardController(this, mLock);
+ }
+ return mSoftKeyboardController;
+ }
+ }
+
+ private void onSoftKeyboardShowModeChanged(int showMode) {
+ if (mSoftKeyboardController != null) {
+ mSoftKeyboardController.dispatchSoftKeyboardShowModeChanged(showMode);
+ }
+ }
+
+ /**
+ * Used to control and query the soft keyboard show mode.
+ */
+ public static final class SoftKeyboardController {
+ private final AccessibilityService mService;
+
+ /**
+ * Map of listeners to their handlers. Lazily created when adding the first
+ * soft keyboard change listener.
+ */
+ private ArrayMap<OnShowModeChangedListener, Handler> mListeners;
+ private final Object mLock;
+
+ SoftKeyboardController(@NonNull AccessibilityService service, @NonNull Object lock) {
+ mService = service;
+ mLock = lock;
+ }
+
+ /**
+ * Called when the service is connected.
+ */
+ void onServiceConnected() {
+ synchronized(mLock) {
+ if (mListeners != null && !mListeners.isEmpty()) {
+ setSoftKeyboardCallbackEnabled(true);
+ }
+ }
+ }
+
+ /**
+ * Adds the specified change listener to the list of show mode change listeners. The
+ * callback will occur on the service's main thread. Listener is not called on registration.
+ */
+ public void addOnShowModeChangedListener(@NonNull OnShowModeChangedListener listener) {
+ addOnShowModeChangedListener(listener, null);
+ }
+
+ /**
+ * Adds the specified change listener to the list of soft keyboard show mode change
+ * listeners. The callback will occur on the specified {@link Handler}'s thread, or on the
+ * services's main thread if the handler is {@code null}.
+ *
+ * @param listener the listener to add, must be non-null
+ * @param handler the handler on which to callback should execute, or {@code null} to
+ * execute on the service's main thread
+ */
+ public void addOnShowModeChangedListener(@NonNull OnShowModeChangedListener listener,
+ @Nullable Handler handler) {
+ synchronized (mLock) {
+ if (mListeners == null) {
+ mListeners = new ArrayMap<>();
+ }
+
+ final boolean shouldEnableCallback = mListeners.isEmpty();
+ mListeners.put(listener, handler);
+
+ if (shouldEnableCallback) {
+ // This may fail if the service is not connected yet, but if we still have
+ // listeners when it connects, we can try again.
+ setSoftKeyboardCallbackEnabled(true);
+ }
+ }
+ }
+
+ /**
+ * Removes all instances of the specified change listener from teh list of magnification
+ * change listeners.
+ *
+ * @param listener the listener to remove, must be non-null
+ * @return {@code true} if at least one instance of the listener was removed
+ */
+ public boolean removeOnShowModeChangedListener(@NonNull OnShowModeChangedListener listener) {
+ if (mListeners == null) {
+ return false;
+ }
+
+ synchronized (mLock) {
+ final int keyIndex = mListeners.indexOfKey(listener);
+ final boolean hasKey = keyIndex >= 0;
+ if (hasKey) {
+ mListeners.removeAt(keyIndex);
+ }
+
+ if (hasKey && mListeners.isEmpty()) {
+ // We just removed the last listener, so we don't need callbacks from the
+ // service anymore.
+ setSoftKeyboardCallbackEnabled(false);
+ }
+
+ return hasKey;
+ }
+ }
+
+ private void setSoftKeyboardCallbackEnabled(boolean enabled) {
+ final IAccessibilityServiceConnection connection =
+ AccessibilityInteractionClient.getInstance().getConnection(
+ mService.mConnectionId);
+ if (connection != null) {
+ try {
+ connection.setSoftKeyboardCallbackEnabled(enabled);
+ } catch (RemoteException re) {
+ throw new RuntimeException(re);
+ }
+ }
+ }
+
+ /**
+ * Dispatches the soft keyboard show mode change to any registered listeners. This should
+ * be called on the service's main thread.
+ */
+ void dispatchSoftKeyboardShowModeChanged(final int showMode) {
+ final ArrayMap<OnShowModeChangedListener, Handler> entries;
+ synchronized (mLock) {
+ if (mListeners == null || mListeners.isEmpty()) {
+ Slog.d(LOG_TAG, "Received soft keyboard show mode changed callback"
+ + " with no listeners registered!");
+ setSoftKeyboardCallbackEnabled(false);
+ return;
+ }
+
+ // Listeners may remove themselves. Perform a shallow copy to avoid concurrent
+ // modification.
+ entries = new ArrayMap<>(mListeners);
+ }
+
+ for (int i = 0, count = entries.size(); i < count; i++) {
+ final OnShowModeChangedListener listener = entries.keyAt(i);
+ final Handler handler = entries.valueAt(i);
+ if (handler != null) {
+ handler.post(new Runnable() {
+ @Override
+ public void run() {
+ listener.onShowModeChanged(SoftKeyboardController.this, showMode);
+ }
+ });
+ } else {
+ // We're already on the main thread, just run the listener.
+ listener.onShowModeChanged(this, showMode);
+ }
+ }
+ }
+
+ /**
+ * Returns the show mode of the soft keyboard. The default show mode is
+ * {@code Settings.Secure.SHOW_MODE_AUTO}, where the soft keyboard is shown when a text
+ * input field is focused. An AccessibilityService can also request the show mode
+ * {@code Settings.Secure.SHOW_MODE_HIDDEN}, where the soft keyboard is never shown.
+ *
+ * @return the current soft keyboard show mode
+ *
+ * @see Settings#Secure#SHOW_MODE_AUTO
+ * @see Settings#Secure#SHOW_MODE_HIDDEN
+ */
+ @SoftKeyboardShowMode
+ public int getShowMode() {
+ try {
+ return Settings.Secure.getInt(mService.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_SOFT_KEYBOARD_MODE);
+ } catch (Settings.SettingNotFoundException e) {
+ Log.v(LOG_TAG, "Failed to obtain the soft keyboard mode", e);
+ // The settings hasn't been changed yet, so it's value is null. Return the default.
+ return 0;
+ }
+ }
+
+ /**
+ * Sets the soft keyboard show mode. The default show mode is
+ * {@code Settings.Secure.SHOW_MODE_AUTO}, where the soft keyboard is shown when a text
+ * input field is focused. An AccessibilityService can also request the show mode
+ * {@code Settings.Secure.SHOW_MODE_HIDDEN}, where the soft keyboard is never shown. The
+ * The lastto this method will be honored, regardless of any previous calls (including those
+ * made by other AccessibilityServices).
+ * <p>
+ * <strong>Note:</strong> If the service is not yet conected (e.g.
+ * {@link AccessibilityService#onServiceConnected()} has not yet been called) or the
+ * service has been disconnected, this method will hav no effect and return {@code false}.
+ *
+ * @param showMode the new show mode for the soft keyboard
+ * @return {@code true} on success
+ *
+ * @see Settings#Secure#SHOW_MODE_AUTO
+ * @see Settings#Secure#SHOW_MODE_HIDDEN
+ */
+ public boolean setShowMode(@SoftKeyboardShowMode int showMode) {
+ final IAccessibilityServiceConnection connection =
+ AccessibilityInteractionClient.getInstance().getConnection(
+ mService.mConnectionId);
+ if (connection != null) {
+ try {
+ return connection.setSoftKeyboardShowMode(showMode);
+ } catch (RemoteException re) {
+ Log.w(LOG_TAG, "Falied to set soft keyboard behavior", re);
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Listener for changes in the soft keyboard show mode.
+ */
+ public interface OnShowModeChangedListener {
+ /**
+ * Called when the soft keyboard behavior changes. The default show mode is
+ * {@code Settings.Secure.SHOW_MODE_AUTO}, where the soft keyboard is shown when a text
+ * input field is focused. An AccessibilityService can also request the show mode
+ * {@code Settings.Secure.SHOW_MODE_HIDDEN}, where the soft keyboard is never shown.
+ *
+ * @param controller the soft keyboard controller
+ * @param showMode the current soft keyboard show mode
+ */
+ void onShowModeChanged(@NonNull SoftKeyboardController controller,
+ @SoftKeyboardShowMode int showMode);
+ }
+ }
+
+ /**
* Performs a global action. Such an action can be performed
* at any moment regardless of the current application or user
* location in that application. For example going back, going
@@ -1054,7 +1318,7 @@
* property in its meta-data. For details refer to {@link #SERVICE_META_DATA}.
* Also the service has to opt-in to retrieve the interactive windows by
* setting the {@link AccessibilityServiceInfo#FLAG_RETRIEVE_INTERACTIVE_WINDOWS}
- * flag.Otherwise, the search will be performed only in the active window.
+ * flag. Otherwise, the search will be performed only in the active window.
* </p>
*
* @param focus The focus to find. One of {@link AccessibilityNodeInfo#FOCUS_INPUT} or
@@ -1191,6 +1455,11 @@
}
@Override
+ public void onSoftKeyboardShowModeChanged(int showMode) {
+ AccessibilityService.this.onSoftKeyboardShowModeChanged(showMode);
+ }
+
+ @Override
public void onPerformGestureResult(int sequence, boolean completedSuccessfully) {
AccessibilityService.this.onPerformGestureResult(sequence, completedSuccessfully);
}
@@ -1212,7 +1481,8 @@
private static final int DO_CLEAR_ACCESSIBILITY_CACHE = 5;
private static final int DO_ON_KEY_EVENT = 6;
private static final int DO_ON_MAGNIFICATION_CHANGED = 7;
- private static final int DO_GESTURE_COMPLETE = 8;
+ private static final int DO_ON_SOFT_KEYBOARD_SHOW_MODE_CHANGED = 8;
+ private static final int DO_GESTURE_COMPLETE = 9;
private final HandlerCaller mCaller;
@@ -1271,6 +1541,12 @@
mCaller.sendMessage(message);
}
+ public void onSoftKeyboardShowModeChanged(int showMode) {
+ final Message message =
+ mCaller.obtainMessageI(DO_ON_SOFT_KEYBOARD_SHOW_MODE_CHANGED, showMode);
+ mCaller.sendMessage(message);
+ }
+
public void onPerformGestureResult(int sequence, boolean successfully) {
Message message = mCaller.obtainMessageII(DO_GESTURE_COMPLETE, sequence,
successfully ? 1 : 0);
@@ -1361,6 +1637,11 @@
mCallback.onMagnificationChanged(region, scale, centerX, centerY);
} return;
+ case DO_ON_SOFT_KEYBOARD_SHOW_MODE_CHANGED: {
+ final int showMode = (int) message.arg1;
+ mCallback.onSoftKeyboardShowModeChanged(showMode);
+ } return;
+
case DO_GESTURE_COMPLETE: {
final boolean successfully = message.arg2 == 1;
mCallback.onPerformGestureResult(message.arg1, successfully);
diff --git a/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl b/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl
index 6280542..ef05d6f 100644
--- a/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl
+++ b/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl
@@ -43,5 +43,7 @@
void onMagnificationChanged(in Region region, float scale, float centerX, float centerY);
+ void onSoftKeyboardShowModeChanged(int showMode);
+
void onPerformGestureResult(int sequence, boolean completedSuccessfully);
}
diff --git a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl
index e58ef2f..d5e8a11 100644
--- a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl
+++ b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl
@@ -84,5 +84,9 @@
void setMagnificationCallbackEnabled(boolean enabled);
+ boolean setSoftKeyboardShowMode(int showMode);
+
+ void setSoftKeyboardCallbackEnabled(boolean enabled);
+
void sendMotionEvents(int sequence, in ParceledListSlice events);
}
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 11154f2..378e448 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -62,7 +62,6 @@
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Icon;
import android.media.AudioManager;
import android.media.session.MediaController;
import android.net.Uri;
@@ -72,7 +71,6 @@
import android.os.IBinder;
import android.os.Looper;
import android.os.Parcelable;
-import android.os.PersistableBundle;
import android.os.RemoteException;
import android.os.StrictMode;
import android.os.UserHandle;
@@ -80,16 +78,12 @@
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.text.method.TextKeyListener;
-import android.transition.Scene;
-import android.transition.TransitionManager;
-import android.util.ArrayMap;
import android.util.AttributeSet;
import android.util.EventLog;
import android.util.Log;
import android.util.PrintWriterPrinter;
import android.util.Slog;
import android.util.SparseArray;
-import android.util.SuperNotCalledException;
import android.view.ActionMode;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
@@ -110,16 +104,11 @@
import android.view.ViewManager;
import android.view.ViewRootImpl;
import android.view.Window;
-import android.view.Window.WindowControllerCallback;
import android.view.WindowManager;
import android.view.WindowManagerGlobal;
import android.view.accessibility.AccessibilityEvent;
import android.widget.AdapterView;
-import android.widget.Toolbar;
-import com.android.internal.app.IVoiceInteractor;
-import com.android.internal.app.ToolbarActionBar;
-import com.android.internal.app.WindowDecorActionBar;
import com.android.internal.policy.PhoneWindow;
import java.io.FileDescriptor;
@@ -1842,14 +1831,14 @@
* visa-versa.
* @see android.R.attr#resizeableActivity
*
- * @param multiWindowMode True if the activity is in multi-window mode.
+ * @param inMultiWindow True if the activity is in multi-window mode.
*/
@CallSuper
- public void onMultiWindowModeChanged(boolean multiWindowMode) {
+ public void onMultiWindowChanged(boolean inMultiWindow) {
if (DEBUG_LIFECYCLE) Slog.v(TAG,
- "onMultiWindowModeChanged " + this + ": " + multiWindowMode);
+ "onMultiWindowChanged " + this + ": " + inMultiWindow);
if (mWindow != null) {
- mWindow.onMultiWindowModeChanged();
+ mWindow.onMultiWindowChanged();
}
}
@@ -1859,9 +1848,9 @@
*
* @return True if the activity is in multi-window mode.
*/
- public boolean inMultiWindowMode() {
+ public boolean inMultiWindow() {
try {
- return ActivityManagerNative.getDefault().inMultiWindowMode(mToken);
+ return ActivityManagerNative.getDefault().inMultiWindow(mToken);
} catch (RemoteException e) {
}
return false;
@@ -1871,11 +1860,11 @@
* Called by the system when the activity changes to and from picture-in-picture mode.
* @see android.R.attr#supportsPictureInPicture
*
- * @param pictureInPictureMode True if the activity is in picture-in-picture mode.
+ * @param inPictureInPicture True if the activity is in picture-in-picture mode.
*/
- public void onPictureInPictureModeChanged(boolean pictureInPictureMode) {
+ public void onPictureInPictureChanged(boolean inPictureInPicture) {
if (DEBUG_LIFECYCLE) Slog.v(TAG,
- "onPictureInPictureModeChanged " + this + ": " + pictureInPictureMode);
+ "onPictureInPictureChanged " + this + ": " + inPictureInPicture);
}
/**
@@ -1884,9 +1873,9 @@
*
* @return True if the activity is in picture-in-picture mode.
*/
- public boolean inPictureInPictureMode() {
+ public boolean inPictureInPicture() {
try {
- return ActivityManagerNative.getDefault().inPictureInPictureMode(mToken);
+ return ActivityManagerNative.getDefault().inPictureInPicture(mToken);
} catch (RemoteException e) {
}
return false;
@@ -1896,9 +1885,9 @@
* Puts the activity in picture-in-picture mode.
* @see android.R.attr#supportsPictureInPicture
*/
- public void enterPictureInPictureMode() {
+ public void enterPictureInPicture() {
try {
- ActivityManagerNative.getDefault().enterPictureInPictureMode(mToken);
+ ActivityManagerNative.getDefault().enterPictureInPicture(mToken);
} catch (RemoteException e) {
}
}
@@ -4397,7 +4386,7 @@
String resolvedType = null;
if (fillInIntent != null) {
fillInIntent.migrateExtraStreamToClipData();
- fillInIntent.prepareToLeaveProcess();
+ fillInIntent.prepareToLeaveProcess(this);
resolvedType = fillInIntent.resolveTypeIfNeeded(getContentResolver());
}
int result = ActivityManagerNative.getDefault()
@@ -4629,7 +4618,7 @@
intent.putExtra(Intent.EXTRA_REFERRER, referrer);
}
intent.migrateExtraStreamToClipData();
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
result = ActivityManagerNative.getDefault()
.startActivity(mMainThread.getApplicationThread(), getBasePackageName(),
intent, intent.resolveTypeIfNeeded(getContentResolver()), mToken,
@@ -4700,7 +4689,7 @@
if (mParent == null) {
try {
intent.migrateExtraStreamToClipData();
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
return ActivityManagerNative.getDefault()
.startNextMatchingActivity(mToken, intent, options);
} catch (RemoteException e) {
@@ -5128,7 +5117,7 @@
if (false) Log.v(TAG, "Finishing self: token=" + mToken);
try {
if (resultData != null) {
- resultData.prepareToLeaveProcess();
+ resultData.prepareToLeaveProcess(this);
}
if (ActivityManagerNative.getDefault()
.finishActivity(mToken, resultCode, resultData, finishTask)) {
@@ -5355,7 +5344,7 @@
@PendingIntent.Flags int flags) {
String packageName = getPackageName();
try {
- data.prepareToLeaveProcess();
+ data.prepareToLeaveProcess(this);
IIntentSender target =
ActivityManagerNative.getDefault().getIntentSender(
ActivityManager.INTENT_SENDER_ACTIVITY_RESULT, packageName,
@@ -5501,8 +5490,7 @@
* class name as the preferences name.
*
* @param mode Operating mode. Use {@link #MODE_PRIVATE} for the default
- * operation, {@link #MODE_WORLD_READABLE} and
- * {@link #MODE_WORLD_WRITEABLE} to control permissions.
+ * operation.
*
* @return Returns the single SharedPreferences instance that can be used
* to retrieve and modify the preference values.
@@ -6335,10 +6323,10 @@
resultData = mResultData;
}
if (resultData != null) {
- resultData.prepareToLeaveProcess();
+ resultData.prepareToLeaveProcess(this);
}
try {
- upIntent.prepareToLeaveProcess();
+ upIntent.prepareToLeaveProcess(this);
return ActivityManagerNative.getDefault().navigateUpTo(mToken, upIntent,
resultCode, resultData);
} catch (RemoteException e) {
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 420bf31..82170d1 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -564,8 +564,7 @@
* there isn't a display gap.
*/
public static boolean preserveWindowOnTaskMove(int stackId) {
- return stackId == FULLSCREEN_WORKSPACE_STACK_ID
- || stackId == DOCKED_STACK_ID || stackId == PINNED_STACK_ID;
+ return stackId == FULLSCREEN_WORKSPACE_STACK_ID || stackId == DOCKED_STACK_ID;
}
/**
@@ -616,6 +615,14 @@
public static boolean keepVisibleDeadAppWindowOnScreen(int stackId) {
return stackId != PINNED_STACK_ID;
}
+
+ /**
+ * Returns true if the backdrop on the client side should match the frame of the window.
+ * Returns false, if the backdrop should be fullscreen.
+ */
+ public static boolean useWindowFrameForBackdrop(int stackId) {
+ return stackId == FREEFORM_WORKSPACE_STACK_ID || stackId == PINNED_STACK_ID;
+ }
}
/**
@@ -1188,6 +1195,12 @@
*/
public Rect bounds;
+ /**
+ * True if the task can go in the docked stack.
+ * @hide
+ */
+ public boolean isDockable;
+
public RecentTaskInfo() {
}
@@ -1231,6 +1244,7 @@
} else {
dest.writeInt(0);
}
+ dest.writeInt(isDockable ? 1 : 0);
}
public void readFromParcel(Parcel source) {
@@ -1253,6 +1267,7 @@
numActivities = source.readInt();
bounds = source.readInt() > 0 ?
Rect.CREATOR.createFromParcel(source) : null;
+ isDockable = source.readInt() == 1;
}
public static final Creator<RecentTaskInfo> CREATOR
@@ -1437,6 +1452,12 @@
*/
public long lastActiveTime;
+ /**
+ * True if the task can go in the docked stack.
+ * @hide
+ */
+ public boolean isDockable;
+
public RunningTaskInfo() {
}
diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java
index 42ff8e8..a3160f4 100644
--- a/core/java/android/app/ActivityManagerNative.java
+++ b/core/java/android/app/ActivityManagerNative.java
@@ -816,7 +816,9 @@
r = Rect.CREATOR.createFromParcel(data);
}
final boolean allowResizeInDockedMode = data.readInt() == 1;
- resizeStack(stackId, r, allowResizeInDockedMode);
+ final boolean preserveWindows = data.readInt() == 1;
+ final boolean animate = data.readInt() == 1;
+ resizeStack(stackId, r, allowResizeInDockedMode, preserveWindows, animate);
reply.writeNoException();
return true;
}
@@ -2585,9 +2587,9 @@
case SET_TASK_RESIZEABLE_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
- int taskId = data.readInt();
- boolean resizeable = (data.readInt() == 1) ? true : false;
- setTaskResizeable(taskId, resizeable);
+ final int taskId = data.readInt();
+ final int resizeableMode = data.readInt();
+ setTaskResizeable(taskId, resizeableMode);
reply.writeNoException();
return true;
}
@@ -2840,26 +2842,26 @@
reply.writeInt(res);
return true;
}
- case IN_MULTI_WINDOW_MODE_TRANSACTION: {
+ case IN_MULTI_WINDOW_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
final IBinder token = data.readStrongBinder();
- final boolean multiWindowMode = inMultiWindowMode(token);
+ final boolean inMultiWindow = inMultiWindow(token);
reply.writeNoException();
- reply.writeInt(multiWindowMode ? 1 : 0);
+ reply.writeInt(inMultiWindow ? 1 : 0);
return true;
}
- case IN_PICTURE_IN_PICTURE_MODE_TRANSACTION: {
+ case IN_PICTURE_IN_PICTURE_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
final IBinder token = data.readStrongBinder();
- final boolean pipMode = inPictureInPictureMode(token);
+ final boolean inPip = inPictureInPicture(token);
reply.writeNoException();
- reply.writeInt(pipMode ? 1 : 0);
+ reply.writeInt(inPip ? 1 : 0);
return true;
}
- case ENTER_PICTURE_IN_PICTURE_MODE_TRANSACTION: {
+ case ENTER_PICTURE_IN_PICTURE_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
final IBinder token = data.readStrongBinder();
- enterPictureInPictureMode(token);
+ enterPictureInPicture(token);
reply.writeNoException();
return true;
}
@@ -3815,9 +3817,8 @@
return res;
}
@Override
- public void resizeStack(int stackId, Rect r, boolean allowResizeInDockedMode)
- throws RemoteException
- {
+ public void resizeStack(int stackId, Rect r, boolean allowResizeInDockedMode,
+ boolean preserveWindows, boolean animate) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
@@ -3829,6 +3830,8 @@
data.writeInt(0);
}
data.writeInt(allowResizeInDockedMode ? 1 : 0);
+ data.writeInt(preserveWindows ? 1 : 0);
+ data.writeInt(animate ? 1 : 0);
mRemote.transact(RESIZE_STACK_TRANSACTION, data, reply, 0);
reply.readException();
data.recycle();
@@ -6304,12 +6307,12 @@
}
@Override
- public void setTaskResizeable(int taskId, boolean resizeable) throws RemoteException {
+ public void setTaskResizeable(int taskId, int resizeableMode) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeInt(taskId);
- data.writeInt(resizeable ? 1 : 0);
+ data.writeInt(resizeableMode);
mRemote.transact(SET_TASK_RESIZEABLE_TRANSACTION, data, reply, 0);
reply.readException();
data.recycle();
@@ -6675,12 +6678,12 @@
}
@Override
- public boolean inMultiWindowMode(IBinder token) throws RemoteException {
+ public boolean inMultiWindow(IBinder token) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeStrongBinder(token);
- mRemote.transact(IN_MULTI_WINDOW_MODE_TRANSACTION, data, reply, 0);
+ mRemote.transact(IN_MULTI_WINDOW_TRANSACTION, data, reply, 0);
reply.readException();
final boolean multiWindowMode = reply.readInt() == 1 ? true : false;
data.recycle();
@@ -6689,12 +6692,12 @@
}
@Override
- public boolean inPictureInPictureMode(IBinder token) throws RemoteException {
+ public boolean inPictureInPicture(IBinder token) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeStrongBinder(token);
- mRemote.transact(IN_PICTURE_IN_PICTURE_MODE_TRANSACTION, data, reply, 0);
+ mRemote.transact(IN_PICTURE_IN_PICTURE_TRANSACTION, data, reply, 0);
reply.readException();
final boolean pipMode = reply.readInt() == 1 ? true : false;
data.recycle();
@@ -6703,12 +6706,12 @@
}
@Override
- public void enterPictureInPictureMode(IBinder token) throws RemoteException {
+ public void enterPictureInPicture(IBinder token) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeStrongBinder(token);
- mRemote.transact(ENTER_PICTURE_IN_PICTURE_MODE_TRANSACTION, data, reply, 0);
+ mRemote.transact(ENTER_PICTURE_IN_PICTURE_TRANSACTION, data, reply, 0);
reply.readException();
data.recycle();
reply.recycle();
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java
index b42cf68..094950b 100644
--- a/core/java/android/app/ActivityOptions.java
+++ b/core/java/android/app/ActivityOptions.java
@@ -19,6 +19,7 @@
import static android.app.ActivityManager.DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT;
import static android.app.ActivityManager.StackId.INVALID_STACK_ID;
+import android.annotation.Nullable;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
@@ -203,7 +204,6 @@
public static final int ANIM_CLIP_REVEAL = 11;
private String mPackageName;
- private boolean mHasLaunchBounds;
private Rect mLaunchBounds;
private int mAnimationType = ANIM_NONE;
private int mCustomEnterResId;
@@ -716,10 +716,7 @@
} catch (RuntimeException e) {
Slog.w(TAG, e);
}
- mHasLaunchBounds = opts.containsKey(KEY_LAUNCH_BOUNDS);
- if (mHasLaunchBounds) {
- mLaunchBounds = opts.getParcelable(KEY_LAUNCH_BOUNDS);
- }
+ mLaunchBounds = opts.getParcelable(KEY_LAUNCH_BOUNDS);
mAnimationType = opts.getInt(KEY_ANIM_TYPE);
switch (mAnimationType) {
case ANIM_CUSTOM:
@@ -779,14 +776,16 @@
}
/**
- * Sets the bounds (window size) that the activity should be launched in. Set to null explicitly
- * for full screen.
- * NOTE: This value is ignored on devices that don't have
- * {@link android.content.pm.PackageManager#FEATURE_FREEFORM_WINDOW_MANAGEMENT} enabled.
+ * Sets the bounds (window size) that the activity should be launched in.
+ * Set to null explicitly for fullscreen.
+ * <p>
+ * <strong>NOTE:<strong/> This value is ignored on devices that don't have
+ * {@link android.content.pm.PackageManager#FEATURE_FREEFORM_WINDOW_MANAGEMENT} or
+ * {@link android.content.pm.PackageManager#FEATURE_PICTURE_IN_PICTURE} enabled.
+ * @param launchBounds Launch bounds to use for the activity or null for fullscreen.
*/
- public ActivityOptions setLaunchBounds(Rect launchBounds) {
- mHasLaunchBounds = true;
- mLaunchBounds = launchBounds;
+ public ActivityOptions setLaunchBounds(@Nullable Rect launchBounds) {
+ mLaunchBounds = launchBounds != null ? new Rect(launchBounds) : null;
return this;
}
@@ -795,11 +794,13 @@
return mPackageName;
}
- public boolean hasLaunchBounds() {
- return mHasLaunchBounds;
- }
-
- public Rect getLaunchBounds(){
+ /**
+ * Returns the bounds that should be used to launch the activity.
+ * @see #setLaunchBounds(Rect)
+ * @return Bounds used to launch the activity.
+ */
+ @Nullable
+ public Rect getLaunchBounds() {
return mLaunchBounds;
}
@@ -1024,7 +1025,7 @@
if (mPackageName != null) {
b.putString(KEY_PACKAGE_NAME, mPackageName);
}
- if (mHasLaunchBounds) {
+ if (mLaunchBounds != null) {
b.putParcelable(KEY_LAUNCH_BOUNDS, mLaunchBounds);
}
b.putInt(KEY_ANIM_TYPE, mAnimationType);
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 1e7457c..89bb01f 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -53,9 +53,9 @@
import android.net.Proxy;
import android.net.ProxyInfo;
import android.net.Uri;
-import android.opengl.GLUtils;
import android.os.AsyncTask;
import android.os.Binder;
+import android.os.Build;
import android.os.Bundle;
import android.os.Debug;
import android.os.DropBoxManager;
@@ -83,7 +83,6 @@
import android.util.ArrayMap;
import android.util.DisplayMetrics;
import android.util.EventLog;
-import android.util.LocaleList;
import android.util.Log;
import android.util.LogPrinter;
import android.util.Pair;
@@ -1244,15 +1243,15 @@
}
@Override
- public void scheduleMultiWindowModeChanged(IBinder token, boolean multiWindowMode)
+ public void scheduleMultiWindowChanged(IBinder token, boolean inMultiWindow)
throws RemoteException {
- sendMessage(H.MULTI_WINDOW_MODE_CHANGED, token, multiWindowMode ? 1 : 0);
+ sendMessage(H.MULTI_WINDOW_CHANGED, token, inMultiWindow ? 1 : 0);
}
@Override
- public void schedulePictureInPictureModeChanged(IBinder token, boolean pipMode)
+ public void schedulePictureInPictureChanged(IBinder token, boolean inPip)
throws RemoteException {
- sendMessage(H.PICTURE_IN_PICTURE_MODE_CHANGED, token, pipMode ? 1 : 0);
+ sendMessage(H.PICTURE_IN_PICTURE_CHANGED, token, inPip ? 1 : 0);
}
@Override
@@ -1324,8 +1323,8 @@
public static final int ENTER_ANIMATION_COMPLETE = 149;
public static final int START_BINDER_TRACKING = 150;
public static final int STOP_BINDER_TRACKING_AND_DUMP = 151;
- public static final int MULTI_WINDOW_MODE_CHANGED = 152;
- public static final int PICTURE_IN_PICTURE_MODE_CHANGED = 153;
+ public static final int MULTI_WINDOW_CHANGED = 152;
+ public static final int PICTURE_IN_PICTURE_CHANGED = 153;
public static final int LOCAL_VOICE_INTERACTION_STARTED = 154;
String codeToString(int code) {
@@ -1380,8 +1379,8 @@
case CANCEL_VISIBLE_BEHIND: return "CANCEL_VISIBLE_BEHIND";
case BACKGROUND_VISIBLE_BEHIND_CHANGED: return "BACKGROUND_VISIBLE_BEHIND_CHANGED";
case ENTER_ANIMATION_COMPLETE: return "ENTER_ANIMATION_COMPLETE";
- case MULTI_WINDOW_MODE_CHANGED: return "MULTI_WINDOW_MODE_CHANGED";
- case PICTURE_IN_PICTURE_MODE_CHANGED: return "PICTURE_IN_PICTURE_MODE_CHANGED";
+ case MULTI_WINDOW_CHANGED: return "MULTI_WINDOW_CHANGED";
+ case PICTURE_IN_PICTURE_CHANGED: return "PICTURE_IN_PICTURE_CHANGED";
case LOCAL_VOICE_INTERACTION_STARTED: return "LOCAL_VOICE_INTERACTION_STARTED";
}
}
@@ -1626,11 +1625,11 @@
case STOP_BINDER_TRACKING_AND_DUMP:
handleStopBinderTrackingAndDump((ParcelFileDescriptor) msg.obj);
break;
- case MULTI_WINDOW_MODE_CHANGED:
- handleMultiWindowModeChanged((IBinder) msg.obj, msg.arg1 == 1);
+ case MULTI_WINDOW_CHANGED:
+ handleMultiWindowChanged((IBinder) msg.obj, msg.arg1 == 1);
break;
- case PICTURE_IN_PICTURE_MODE_CHANGED:
- handlePictureInPictureModeChanged((IBinder) msg.obj, msg.arg1 == 1);
+ case PICTURE_IN_PICTURE_CHANGED:
+ handlePictureInPictureChanged((IBinder) msg.obj, msg.arg1 == 1);
break;
case LOCAL_VOICE_INTERACTION_STARTED:
handleLocalVoiceInteractionStarted((IBinder) ((SomeArgs) msg.obj).arg1,
@@ -2879,17 +2878,17 @@
}
}
- private void handleMultiWindowModeChanged(IBinder token, boolean multiWindowMode) {
+ private void handleMultiWindowChanged(IBinder token, boolean inMultiWindow) {
final ActivityClientRecord r = mActivities.get(token);
if (r != null) {
- r.activity.onMultiWindowModeChanged(multiWindowMode);
+ r.activity.onMultiWindowChanged(inMultiWindow);
}
}
- private void handlePictureInPictureModeChanged(IBinder token, boolean pipMode) {
+ private void handlePictureInPictureChanged(IBinder token, boolean inPip) {
final ActivityClientRecord r = mActivities.get(token);
if (r != null) {
- r.activity.onPictureInPictureModeChanged(pipMode);
+ r.activity.onPictureInPictureChanged(inPip);
}
}
@@ -4659,6 +4658,16 @@
}
}
+ /**
+ * Public entrypoint to stop profiling. This is required to end profiling when the app crashes,
+ * so that profiler data won't be lost.
+ *
+ * @hide
+ */
+ public void stopProfiling() {
+ mProfiler.stopProfiling();
+ }
+
static final void handleDumpHeap(boolean managed, DumpHeapData dhd) {
if (managed) {
try {
@@ -4959,16 +4968,22 @@
}
/**
- * For apps targetting SDK Honeycomb or later, we don't allow
- * network usage on the main event loop / UI thread.
- *
- * Note to those grepping: this is what ultimately throws
- * NetworkOnMainThreadException ...
+ * For apps targetting Honeycomb or later, we don't allow network usage
+ * on the main event loop / UI thread. This is what ultimately throws
+ * {@link NetworkOnMainThreadException}.
*/
- if (data.appInfo.targetSdkVersion > 9) {
+ if (data.appInfo.targetSdkVersion >= Build.VERSION_CODES.HONEYCOMB) {
StrictMode.enableDeathOnNetwork();
}
+ /**
+ * For apps targetting N or later, we don't allow file:// Uri exposure.
+ * This is what ultimately throws {@link FileUriExposedException}.
+ */
+ if (data.appInfo.targetSdkVersion >= Build.VERSION_CODES.N) {
+ StrictMode.enableDeathOnFileUriExposure();
+ }
+
NetworkSecurityPolicy.getInstance().setCleartextTrafficPermitted(
(data.appInfo.flags & ApplicationInfo.FLAG_USES_CLEARTEXT_TRAFFIC) != 0);
diff --git a/core/java/android/app/ApplicationThreadNative.java b/core/java/android/app/ApplicationThreadNative.java
index 9be7f23..59ecc03 100644
--- a/core/java/android/app/ApplicationThreadNative.java
+++ b/core/java/android/app/ApplicationThreadNative.java
@@ -730,21 +730,21 @@
return true;
}
- case SCHEDULE_MULTI_WINDOW_MODE_CHANGED_TRANSACTION:
+ case SCHEDULE_MULTI_WINDOW_CHANGED_TRANSACTION:
{
data.enforceInterface(IApplicationThread.descriptor);
final IBinder b = data.readStrongBinder();
- final boolean multiWindowMode = data.readInt() != 0;
- scheduleMultiWindowModeChanged(b, multiWindowMode);
+ final boolean inMultiWindow = data.readInt() != 0;
+ scheduleMultiWindowChanged(b, inMultiWindow);
return true;
}
- case SCHEDULE_PICTURE_IN_PICTURE_MODE_CHANGED_TRANSACTION:
+ case SCHEDULE_PICTURE_IN_PICTURE_CHANGED_TRANSACTION:
{
data.enforceInterface(IApplicationThread.descriptor);
final IBinder b = data.readStrongBinder();
- final boolean pipMode = data.readInt() != 0;
- schedulePictureInPictureModeChanged(b, pipMode);
+ final boolean inPip = data.readInt() != 0;
+ schedulePictureInPictureChanged(b, inPip);
return true;
}
@@ -1495,25 +1495,25 @@
}
@Override
- public final void scheduleMultiWindowModeChanged(
- IBinder token, boolean multiWindowMode) throws RemoteException {
+ public final void scheduleMultiWindowChanged(
+ IBinder token, boolean inMultiWindow) throws RemoteException {
Parcel data = Parcel.obtain();
data.writeInterfaceToken(IApplicationThread.descriptor);
data.writeStrongBinder(token);
- data.writeInt(multiWindowMode ? 1 : 0);
- mRemote.transact(SCHEDULE_MULTI_WINDOW_MODE_CHANGED_TRANSACTION, data, null,
+ data.writeInt(inMultiWindow ? 1 : 0);
+ mRemote.transact(SCHEDULE_MULTI_WINDOW_CHANGED_TRANSACTION, data, null,
IBinder.FLAG_ONEWAY);
data.recycle();
}
@Override
- public final void schedulePictureInPictureModeChanged(IBinder token, boolean pipMode)
+ public final void schedulePictureInPictureChanged(IBinder token, boolean inPip)
throws RemoteException {
Parcel data = Parcel.obtain();
data.writeInterfaceToken(IApplicationThread.descriptor);
data.writeStrongBinder(token);
- data.writeInt(pipMode ? 1 : 0);
- mRemote.transact(SCHEDULE_PICTURE_IN_PICTURE_MODE_CHANGED_TRANSACTION, data, null,
+ data.writeInt(inPip ? 1 : 0);
+ mRemote.transact(SCHEDULE_PICTURE_IN_PICTURE_CHANGED_TRANSACTION, data, null,
IBinder.FLAG_ONEWAY);
data.recycle();
}
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index fab3740..c5b5b08 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -16,9 +16,6 @@
package android.app;
-import com.android.internal.annotations.GuardedBy;
-import com.android.internal.util.Preconditions;
-
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.ContentProvider;
@@ -61,7 +58,6 @@
import android.os.ServiceManager;
import android.os.UserHandle;
import android.os.storage.IMountService;
-import android.os.storage.StorageManager;
import android.util.AndroidRuntimeException;
import android.util.ArrayMap;
import android.util.Log;
@@ -69,10 +65,14 @@
import android.view.Display;
import android.view.DisplayAdjustments;
+import com.android.internal.annotations.GuardedBy;
+import com.android.internal.util.Preconditions;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
+import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.util.Objects;
@@ -340,23 +340,14 @@
@Override
public SharedPreferences getSharedPreferences(File file, int mode) {
+ checkMode(mode);
SharedPreferencesImpl sp;
synchronized (ContextImpl.class) {
- if (sSharedPrefs == null) {
- sSharedPrefs = new ArrayMap<String, ArrayMap<File, SharedPreferencesImpl>>();
- }
-
- final String packageName = getPackageName();
- ArrayMap<File, SharedPreferencesImpl> packagePrefs = sSharedPrefs.get(packageName);
- if (packagePrefs == null) {
- packagePrefs = new ArrayMap<File, SharedPreferencesImpl>();
- sSharedPrefs.put(packageName, packagePrefs);
- }
-
- sp = packagePrefs.get(file);
+ final ArrayMap<File, SharedPreferencesImpl> cache = getSharedPreferencesCacheLocked();
+ sp = cache.get(file);
if (sp == null) {
sp = new SharedPreferencesImpl(file, mode);
- packagePrefs.put(file, sp);
+ cache.put(file, sp);
return sp;
}
}
@@ -370,12 +361,90 @@
return sp;
}
+ private ArrayMap<File, SharedPreferencesImpl> getSharedPreferencesCacheLocked() {
+ if (sSharedPrefs == null) {
+ sSharedPrefs = new ArrayMap<>();
+ }
+
+ final String packageName = getPackageName();
+ ArrayMap<File, SharedPreferencesImpl> packagePrefs = sSharedPrefs.get(packageName);
+ if (packagePrefs == null) {
+ packagePrefs = new ArrayMap<>();
+ sSharedPrefs.put(packageName, packagePrefs);
+ }
+
+ return packagePrefs;
+ }
+
+ /**
+ * Try our best to migrate all files from source to target that match
+ * requested prefix. Return false if we have any trouble migrating.
+ */
+ private static boolean migrateFiles(File sourceDir, File targetDir, final String prefix) {
+ final File[] sourceFiles = FileUtils.listFilesOrEmpty(sourceDir, new FilenameFilter() {
+ @Override
+ public boolean accept(File dir, String name) {
+ return name.startsWith(prefix);
+ }
+ });
+
+ boolean res = true;
+ for (File sourceFile : sourceFiles) {
+ final File targetFile = new File(targetDir, sourceFile.getName());
+ Log.d(TAG, "Migrating " + sourceFile + " to " + targetFile);
+ try {
+ FileUtils.copyFileOrThrow(sourceFile, targetFile);
+ FileUtils.copyPermissions(sourceFile, targetFile);
+ if (!sourceFile.delete()) {
+ throw new IOException("Failed to clean up " + sourceFile);
+ }
+ } catch (IOException e) {
+ Log.w(TAG, "Failed to migrate " + sourceFile + ": " + e);
+ res = false;
+ }
+ }
+ return res;
+ }
+
+ @Override
+ public boolean migrateSharedPreferencesFrom(Context sourceContext, String name) {
+ synchronized (ContextImpl.class) {
+ final File source = sourceContext.getSharedPreferencesPath(name);
+ final File target = getSharedPreferencesPath(name);
+
+ // Evict any in-memory caches for either location
+ final ArrayMap<File, SharedPreferencesImpl> cache = getSharedPreferencesCacheLocked();
+ cache.remove(source);
+ cache.remove(target);
+
+ return migrateFiles(source.getParentFile(), target.getParentFile(), source.getName());
+ }
+ }
+
+ @Override
+ public boolean deleteSharedPreferences(String name) {
+ synchronized (ContextImpl.class) {
+ final File prefs = getSharedPreferencesPath(name);
+ final File prefsBackup = SharedPreferencesImpl.makeBackupFile(prefs);
+
+ // Evict any in-memory caches
+ final ArrayMap<File, SharedPreferencesImpl> cache = getSharedPreferencesCacheLocked();
+ cache.remove(prefs);
+
+ prefs.delete();
+ prefsBackup.delete();
+
+ // We failed if files are still lingering
+ return !(prefs.exists() || prefsBackup.exists());
+ }
+ }
+
private File getPreferencesDir() {
synchronized (mSync) {
if (mPreferencesDir == null) {
mPreferencesDir = new File(getDataDirFile(), "shared_prefs");
}
- return mPreferencesDir;
+ return ensurePrivateDirExists(mPreferencesDir);
}
}
@@ -387,8 +456,8 @@
}
@Override
- public FileOutputStream openFileOutput(String name, int mode)
- throws FileNotFoundException {
+ public FileOutputStream openFileOutput(String name, int mode) throws FileNotFoundException {
+ checkMode(mode);
final boolean append = (mode&MODE_APPEND) != 0;
File f = makeFilename(getFilesDir(), name);
try {
@@ -416,14 +485,14 @@
}
// Common-path handling of app data dir creation
- private static File createFilesDirLocked(File file) {
+ private static File ensurePrivateDirExists(File file) {
if (!file.exists()) {
if (!file.mkdirs()) {
if (file.exists()) {
// spurious failure; probably racing with another process for this app
return file;
}
- Log.w(TAG, "Unable to create files subdir " + file.getPath());
+ Log.w(TAG, "Failed to ensure directory " + file.getAbsolutePath());
return null;
}
FileUtils.setPermissions(
@@ -440,7 +509,7 @@
if (mFilesDir == null) {
mFilesDir = new File(getDataDirFile(), "files");
}
- return createFilesDirLocked(mFilesDir);
+ return ensurePrivateDirExists(mFilesDir);
}
}
@@ -450,7 +519,7 @@
if (mNoBackupFilesDir == null) {
mNoBackupFilesDir = new File(getDataDirFile(), "no_backup");
}
- return createFilesDirLocked(mNoBackupFilesDir);
+ return ensurePrivateDirExists(mNoBackupFilesDir);
}
}
@@ -474,7 +543,7 @@
}
// Create dirs if needed
- return ensureDirsExistOrFilter(dirs);
+ return ensureExternalDirsExistOrFilter(dirs);
}
}
@@ -492,7 +561,7 @@
}
// Create dirs if needed
- return ensureDirsExistOrFilter(mExternalObbDirs);
+ return ensureExternalDirsExistOrFilter(mExternalObbDirs);
}
}
@@ -502,7 +571,7 @@
if (mCacheDir == null) {
mCacheDir = new File(getDataDirFile(), "cache");
}
- return createFilesDirLocked(mCacheDir);
+ return ensurePrivateDirExists(mCacheDir);
}
}
@@ -512,7 +581,7 @@
if (mCodeCacheDir == null) {
mCodeCacheDir = new File(getDataDirFile(), "code_cache");
}
- return createFilesDirLocked(mCodeCacheDir);
+ return ensurePrivateDirExists(mCodeCacheDir);
}
}
@@ -530,7 +599,7 @@
}
// Create dirs if needed
- return ensureDirsExistOrFilter(mExternalCacheDirs);
+ return ensureExternalDirsExistOrFilter(mExternalCacheDirs);
}
}
@@ -542,7 +611,7 @@
}
// Create dirs if needed
- return ensureDirsExistOrFilter(mExternalMediaDirs);
+ return ensureExternalDirsExistOrFilter(mExternalMediaDirs);
}
}
@@ -570,7 +639,8 @@
@Override
public SQLiteDatabase openOrCreateDatabase(String name, int mode, CursorFactory factory,
DatabaseErrorHandler errorHandler) {
- File f = validateFilePath(name, true);
+ checkMode(mode);
+ File f = getDatabasePath(name);
int flags = SQLiteDatabase.CREATE_IF_NECESSARY;
if ((mode & MODE_ENABLE_WRITE_AHEAD_LOGGING) != 0) {
flags |= SQLiteDatabase.ENABLE_WRITE_AHEAD_LOGGING;
@@ -584,9 +654,18 @@
}
@Override
+ public boolean migrateDatabaseFrom(Context sourceContext, String name) {
+ synchronized (ContextImpl.class) {
+ final File source = sourceContext.getDatabasePath(name);
+ final File target = getDatabasePath(name);
+ return migrateFiles(source.getParentFile(), target.getParentFile(), source.getName());
+ }
+ }
+
+ @Override
public boolean deleteDatabase(String name) {
try {
- File f = validateFilePath(name, false);
+ File f = getDatabasePath(name);
return SQLiteDatabase.deleteDatabase(f);
} catch (Exception e) {
}
@@ -595,7 +674,26 @@
@Override
public File getDatabasePath(String name) {
- return validateFilePath(name, false);
+ File dir;
+ File f;
+
+ if (name.charAt(0) == File.separatorChar) {
+ String dirPath = name.substring(0, name.lastIndexOf(File.separatorChar));
+ dir = new File(dirPath);
+ name = name.substring(name.lastIndexOf(File.separatorChar));
+ f = new File(dir, name);
+ } else {
+ dir = getDatabasesDir();
+ f = makeFilename(dir, name);
+ }
+
+ if (!dir.isDirectory() && dir.mkdir()) {
+ FileUtils.setPermissions(dir.getPath(),
+ FileUtils.S_IRWXU|FileUtils.S_IRWXG|FileUtils.S_IXOTH,
+ -1, -1);
+ }
+
+ return f;
}
@Override
@@ -604,16 +702,16 @@
return (list != null) ? list : EMPTY_STRING_ARRAY;
}
-
private File getDatabasesDir() {
synchronized (mSync) {
if (mDatabasesDir == null) {
- mDatabasesDir = new File(getDataDirFile(), "databases");
+ if ("android".equals(getPackageName())) {
+ mDatabasesDir = new File("/data/system");
+ } else {
+ mDatabasesDir = new File(getDataDirFile(), "databases");
+ }
}
- if (mDatabasesDir.getPath().equals("databases")) {
- mDatabasesDir = new File("/data/system");
- }
- return mDatabasesDir;
+ return ensurePrivateDirExists(mDatabasesDir);
}
}
@@ -752,7 +850,7 @@
String resolvedType = null;
if (fillInIntent != null) {
fillInIntent.migrateExtraStreamToClipData();
- fillInIntent.prepareToLeaveProcess();
+ fillInIntent.prepareToLeaveProcess(this);
resolvedType = fillInIntent.resolveTypeIfNeeded(getContentResolver());
}
int result = ActivityManagerNative.getDefault()
@@ -773,7 +871,7 @@
warnIfCallingFromSystemProcess();
String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
ActivityManagerNative.getDefault().broadcastIntent(
mMainThread.getApplicationThread(), intent, resolvedType, null,
Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, null, false, false,
@@ -790,7 +888,7 @@
String[] receiverPermissions = receiverPermission == null ? null
: new String[] {receiverPermission};
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
ActivityManagerNative.getDefault().broadcastIntent(
mMainThread.getApplicationThread(), intent, resolvedType, null,
Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE,
@@ -805,7 +903,7 @@
warnIfCallingFromSystemProcess();
String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
ActivityManagerNative.getDefault().broadcastIntent(
mMainThread.getApplicationThread(), intent, resolvedType, null,
Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE,
@@ -822,7 +920,7 @@
String[] receiverPermissions = receiverPermission == null ? null
: new String[] {receiverPermission};
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
ActivityManagerNative.getDefault().broadcastIntent(
mMainThread.getApplicationThread(), intent, resolvedType, null,
Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE,
@@ -839,7 +937,7 @@
String[] receiverPermissions = receiverPermission == null ? null
: new String[] {receiverPermission};
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
ActivityManagerNative.getDefault().broadcastIntent(
mMainThread.getApplicationThread(), intent, resolvedType, null,
Activity.RESULT_OK, null, null, receiverPermissions, appOp, null, false, false,
@@ -856,7 +954,7 @@
String[] receiverPermissions = receiverPermission == null ? null
: new String[] {receiverPermission};
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
ActivityManagerNative.getDefault().broadcastIntent(
mMainThread.getApplicationThread(), intent, resolvedType, null,
Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE,
@@ -919,7 +1017,7 @@
String[] receiverPermissions = receiverPermission == null ? null
: new String[] {receiverPermission};
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
ActivityManagerNative.getDefault().broadcastIntent(
mMainThread.getApplicationThread(), intent, resolvedType, rd,
initialCode, initialData, initialExtras, receiverPermissions, appOp,
@@ -933,7 +1031,7 @@
public void sendBroadcastAsUser(Intent intent, UserHandle user) {
String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
ActivityManagerNative.getDefault().broadcastIntent(mMainThread.getApplicationThread(),
intent, resolvedType, null, Activity.RESULT_OK, null, null, null,
AppOpsManager.OP_NONE, null, false, false, user.getIdentifier());
@@ -955,7 +1053,7 @@
String[] receiverPermissions = receiverPermission == null ? null
: new String[] {receiverPermission};
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
ActivityManagerNative.getDefault().broadcastIntent(
mMainThread.getApplicationThread(), intent, resolvedType, null,
Activity.RESULT_OK, null, null, receiverPermissions, appOp, null, false, false,
@@ -1006,7 +1104,7 @@
String[] receiverPermissions = receiverPermission == null ? null
: new String[] {receiverPermission};
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
ActivityManagerNative.getDefault().broadcastIntent(
mMainThread.getApplicationThread(), intent, resolvedType, rd,
initialCode, initialData, initialExtras, receiverPermissions,
@@ -1022,7 +1120,7 @@
warnIfCallingFromSystemProcess();
String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
ActivityManagerNative.getDefault().broadcastIntent(
mMainThread.getApplicationThread(), intent, resolvedType, null,
Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, null, false, true,
@@ -1058,7 +1156,7 @@
}
String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
ActivityManagerNative.getDefault().broadcastIntent(
mMainThread.getApplicationThread(), intent, resolvedType, rd,
initialCode, initialData, initialExtras, null,
@@ -1077,7 +1175,7 @@
intent.setDataAndType(intent.getData(), resolvedType);
}
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
ActivityManagerNative.getDefault().unbroadcastIntent(
mMainThread.getApplicationThread(), intent, getUserId());
} catch (RemoteException e) {
@@ -1090,7 +1188,7 @@
public void sendStickyBroadcastAsUser(Intent intent, UserHandle user) {
String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
ActivityManagerNative.getDefault().broadcastIntent(
mMainThread.getApplicationThread(), intent, resolvedType, null,
Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, null, false, true,
@@ -1105,7 +1203,7 @@
public void sendStickyBroadcastAsUser(Intent intent, UserHandle user, Bundle options) {
String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
ActivityManagerNative.getDefault().broadcastIntent(
mMainThread.getApplicationThread(), intent, resolvedType, null,
Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, options, false, true,
@@ -1140,7 +1238,7 @@
}
String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
ActivityManagerNative.getDefault().broadcastIntent(
mMainThread.getApplicationThread(), intent, resolvedType, rd,
initialCode, initialData, initialExtras, null,
@@ -1159,7 +1257,7 @@
intent.setDataAndType(intent.getData(), resolvedType);
}
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(this);
ActivityManagerNative.getDefault().unbroadcastIntent(
mMainThread.getApplicationThread(), intent, user.getIdentifier());
} catch (RemoteException e) {
@@ -1262,7 +1360,7 @@
private ComponentName startServiceCommon(Intent service, UserHandle user) {
try {
validateServiceIntent(service);
- service.prepareToLeaveProcess();
+ service.prepareToLeaveProcess(this);
ComponentName cn = ActivityManagerNative.getDefault().startService(
mMainThread.getApplicationThread(), service, service.resolveTypeIfNeeded(
getContentResolver()), getOpPackageName(), user.getIdentifier());
@@ -1291,7 +1389,7 @@
private boolean stopServiceCommon(Intent service, UserHandle user) {
try {
validateServiceIntent(service);
- service.prepareToLeaveProcess();
+ service.prepareToLeaveProcess(this);
int res = ActivityManagerNative.getDefault().stopService(
mMainThread.getApplicationThread(), service,
service.resolveTypeIfNeeded(getContentResolver()), user.getIdentifier());
@@ -1339,7 +1437,7 @@
< android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
flags |= BIND_WAIVE_PRIORITY;
}
- service.prepareToLeaveProcess();
+ service.prepareToLeaveProcess(this);
int res = ActivityManagerNative.getDefault().bindService(
mMainThread.getApplicationThread(), getActivityToken(), service,
service.resolveTypeIfNeeded(getContentResolver()),
@@ -1798,19 +1896,30 @@
private File getDataDirFile() {
if (mPackageInfo != null) {
+ File res = null;
if (isCredentialEncryptedStorage()) {
- return mPackageInfo.getCredentialEncryptedDataDirFile();
+ res = mPackageInfo.getCredentialEncryptedDataDirFile();
} else if (isDeviceEncryptedStorage()) {
- return mPackageInfo.getDeviceEncryptedDataDirFile();
+ res = mPackageInfo.getDeviceEncryptedDataDirFile();
} else {
- return mPackageInfo.getDataDirFile();
+ res = mPackageInfo.getDataDirFile();
}
+
+ if (res != null) {
+ return res;
+ } else {
+ throw new RuntimeException(
+ "No data directory found for package " + getPackageName());
+ }
+ } else {
+ throw new RuntimeException(
+ "No package details found for package " + getPackageName());
}
- throw new RuntimeException("Not supported in system context");
}
@Override
public File getDir(String name, int mode) {
+ checkMode(mode);
name = "app_" + name;
File file = makeFilename(getDataDirFile(), name);
if (!file.exists()) {
@@ -1963,6 +2072,17 @@
return mActivityToken;
}
+ private void checkMode(int mode) {
+ if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.N) {
+ if ((mode & MODE_WORLD_READABLE) != 0) {
+ throw new SecurityException("MODE_WORLD_READABLE no longer supported");
+ }
+ if ((mode & MODE_WORLD_WRITEABLE) != 0) {
+ throw new SecurityException("MODE_WORLD_WRITEABLE no longer supported");
+ }
+ }
+ }
+
@SuppressWarnings("deprecation")
static void setFilePermissionsFromMode(String name, int mode,
int extraPermissions) {
@@ -1982,29 +2102,6 @@
FileUtils.setPermissions(name, perms, -1, -1);
}
- private File validateFilePath(String name, boolean createDirectory) {
- File dir;
- File f;
-
- if (name.charAt(0) == File.separatorChar) {
- String dirPath = name.substring(0, name.lastIndexOf(File.separatorChar));
- dir = new File(dirPath);
- name = name.substring(name.lastIndexOf(File.separatorChar));
- f = new File(dir, name);
- } else {
- dir = getDatabasesDir();
- f = makeFilename(dir, name);
- }
-
- if (createDirectory && !dir.isDirectory() && dir.mkdir()) {
- FileUtils.setPermissions(dir.getPath(),
- FileUtils.S_IRWXU|FileUtils.S_IRWXG|FileUtils.S_IXOTH,
- -1, -1);
- }
-
- return f;
- }
-
private File makeFilename(File base, String name) {
if (name.indexOf(File.separatorChar) < 0) {
return new File(base, name);
@@ -2017,7 +2114,7 @@
* Ensure that given directories exist, trying to create them if missing. If
* unable to create, they are filtered by replacing with {@code null}.
*/
- private File[] ensureDirsExistOrFilter(File[] dirs) {
+ private File[] ensureExternalDirsExistOrFilter(File[] dirs) {
File[] result = new File[dirs.length];
for (int i = 0; i < dirs.length; i++) {
File dir = dirs[i];
diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java
index 22de2ff..f5e7d78 100644
--- a/core/java/android/app/IActivityManager.java
+++ b/core/java/android/app/IActivityManager.java
@@ -146,8 +146,8 @@
public void moveTaskToDockedStack(int taskId, int createMode, boolean toTop, boolean animate,
Rect initialBounds) throws RemoteException;
public boolean moveTopActivityToPinnedStack(int stackId, Rect bounds) throws RemoteException;
- public void resizeStack(int stackId, Rect bounds, boolean allowResizeInDockedMode)
- throws RemoteException;
+ public void resizeStack(int stackId, Rect bounds, boolean allowResizeInDockedMode,
+ boolean preserveWindows, boolean animate) throws RemoteException;
/**
* Resizes the docked stack, and all other stacks as the result of the dock stack bounds change.
@@ -530,7 +530,7 @@
public void setTaskDescription(IBinder token, ActivityManager.TaskDescription values)
throws RemoteException;
- public void setTaskResizeable(int taskId, boolean resizeable) throws RemoteException;
+ public void setTaskResizeable(int taskId, int resizeableMode) throws RemoteException;
public void resizeTask(int taskId, Rect bounds, int resizeMode) throws RemoteException;
public Rect getTaskBounds(int taskId) throws RemoteException;
@@ -581,11 +581,11 @@
public int getAppStartMode(int uid, String packageName) throws RemoteException;
- public boolean inMultiWindowMode(IBinder token) throws RemoteException;
+ public boolean inMultiWindow(IBinder token) throws RemoteException;
- public boolean inPictureInPictureMode(IBinder token) throws RemoteException;
+ public boolean inPictureInPicture(IBinder token) throws RemoteException;
- public void enterPictureInPictureMode(IBinder token) throws RemoteException;
+ public void enterPictureInPicture(IBinder token) throws RemoteException;
public void setVrMode(IBinder token, boolean enabled) throws RemoteException;
@@ -958,10 +958,10 @@
int MOVE_TOP_ACTIVITY_TO_PINNED_STACK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 349;
int GET_APP_START_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 350;
int UNLOCK_USER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 351;
- int IN_MULTI_WINDOW_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 352;
- int IN_PICTURE_IN_PICTURE_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 353;
+ int IN_MULTI_WINDOW_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 352;
+ int IN_PICTURE_IN_PICTURE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 353;
int KILL_PACKAGE_DEPENDENTS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 354;
- int ENTER_PICTURE_IN_PICTURE_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 355;
+ int ENTER_PICTURE_IN_PICTURE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 355;
int ACTIVITY_RELAUNCHED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 356;
int GET_URI_PERMISSION_OWNER_FOR_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 357;
int RESIZE_DOCKED_STACK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 358;
diff --git a/core/java/android/app/IApplicationThread.java b/core/java/android/app/IApplicationThread.java
index 6d64bd0..b55da88 100644
--- a/core/java/android/app/IApplicationThread.java
+++ b/core/java/android/app/IApplicationThread.java
@@ -152,8 +152,8 @@
void notifyCleartextNetwork(byte[] firstPacket) throws RemoteException;
void startBinderTracking() throws RemoteException;
void stopBinderTrackingAndDump(FileDescriptor fd) throws RemoteException;
- void scheduleMultiWindowModeChanged(IBinder token, boolean multiWindowMode) throws RemoteException;
- void schedulePictureInPictureModeChanged(IBinder token, boolean multiWindowMode) throws RemoteException;
+ void scheduleMultiWindowChanged(IBinder token, boolean multiWindowMode) throws RemoteException;
+ void schedulePictureInPictureChanged(IBinder token, boolean multiWindowMode) throws RemoteException;
void scheduleLocalVoiceInteractionStarted(IBinder token, IVoiceInteractor voiceInteractor) throws RemoteException;
String descriptor = "android.app.IApplicationThread";
@@ -215,7 +215,7 @@
int NOTIFY_CLEARTEXT_NETWORK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+55;
int START_BINDER_TRACKING_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+56;
int STOP_BINDER_TRACKING_AND_DUMP_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+57;
- int SCHEDULE_MULTI_WINDOW_MODE_CHANGED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+58;
- int SCHEDULE_PICTURE_IN_PICTURE_MODE_CHANGED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+59;
+ int SCHEDULE_MULTI_WINDOW_CHANGED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+58;
+ int SCHEDULE_PICTURE_IN_PICTURE_CHANGED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+59;
int SCHEDULE_LOCAL_VOICE_INTERACTION_STARTED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+60;
}
diff --git a/core/java/android/app/IUiAutomationConnection.aidl b/core/java/android/app/IUiAutomationConnection.aidl
index 2caec369..7640e75 100644
--- a/core/java/android/app/IUiAutomationConnection.aidl
+++ b/core/java/android/app/IUiAutomationConnection.aidl
@@ -33,7 +33,7 @@
* {@hide}
*/
interface IUiAutomationConnection {
- void connect(IAccessibilityServiceClient client);
+ void connect(IAccessibilityServiceClient client, int flags);
void disconnect();
boolean injectInputEvent(in InputEvent event, boolean sync);
boolean setRotation(int rotation);
diff --git a/core/java/android/app/IWallpaperManager.aidl b/core/java/android/app/IWallpaperManager.aidl
index 7a0e7f6..fa0fbd1 100644
--- a/core/java/android/app/IWallpaperManager.aidl
+++ b/core/java/android/app/IWallpaperManager.aidl
@@ -35,10 +35,16 @@
* 'which' is some combination of:
* FLAG_SET_SYSTEM
* FLAG_SET_LOCK
+ *
+ * A 'null' cropHint rectangle is explicitly permitted as a sentinel for "whatever
+ * the source image's bounding rect is."
+ *
+ * The completion callback's "onWallpaperChanged()" method is invoked when the
+ * new wallpaper content is ready to display.
*/
ParcelFileDescriptor setWallpaper(String name, in String callingPackage,
- out Bundle extras, int which);
-
+ in Rect cropHint, out Bundle extras, int which, IWallpaperManagerCallback completion);
+
/**
* Set the live wallpaper. This only affects the system wallpaper.
*/
@@ -54,14 +60,14 @@
*/
ParcelFileDescriptor getWallpaper(IWallpaperManagerCallback cb,
out Bundle outParams);
-
+
/**
* If the current system wallpaper is a live wallpaper component, return the
* information about that wallpaper. Otherwise, if it is a static image,
* simply return null.
*/
WallpaperInfo getWallpaperInfo();
-
+
/**
* Clear the system wallpaper.
*/
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
index 24a3470..9a88f2c 100644
--- a/core/java/android/app/Instrumentation.java
+++ b/core/java/android/app/Instrumentation.java
@@ -1503,7 +1503,7 @@
}
try {
intent.migrateExtraStreamToClipData();
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(who);
int result = ActivityManagerNative.getDefault()
.startActivity(whoThread, who.getBasePackageName(), intent,
intent.resolveTypeIfNeeded(who.getContentResolver()),
@@ -1561,7 +1561,7 @@
String[] resolvedTypes = new String[intents.length];
for (int i=0; i<intents.length; i++) {
intents[i].migrateExtraStreamToClipData();
- intents[i].prepareToLeaveProcess();
+ intents[i].prepareToLeaveProcess(who);
resolvedTypes[i] = intents[i].resolveTypeIfNeeded(who.getContentResolver());
}
int result = ActivityManagerNative.getDefault()
@@ -1622,7 +1622,7 @@
}
try {
intent.migrateExtraStreamToClipData();
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(who);
int result = ActivityManagerNative.getDefault()
.startActivity(whoThread, who.getBasePackageName(), intent,
intent.resolveTypeIfNeeded(who.getContentResolver()),
@@ -1682,7 +1682,7 @@
}
try {
intent.migrateExtraStreamToClipData();
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(who);
int result = ActivityManagerNative.getDefault()
.startActivityAsUser(whoThread, who.getBasePackageName(), intent,
intent.resolveTypeIfNeeded(who.getContentResolver()),
@@ -1721,7 +1721,7 @@
}
try {
intent.migrateExtraStreamToClipData();
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(who);
int result = ActivityManagerNative.getDefault()
.startActivityAsCaller(whoThread, who.getBasePackageName(), intent,
intent.resolveTypeIfNeeded(who.getContentResolver()),
@@ -1759,7 +1759,7 @@
}
try {
intent.migrateExtraStreamToClipData();
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(who);
int result = appTask.startActivity(whoThread.asBinder(), who.getBasePackageName(),
intent, intent.resolveTypeIfNeeded(who.getContentResolver()), options);
checkStartActivityResult(result, intent);
@@ -1837,16 +1837,59 @@
* {@link Instrumentation} APIs. Using both APIs at the same time is not
* a mistake by itself but a client has to be aware of the APIs limitations.
* </p>
- * @return The UI automation instance.
+ * @return The UI automation instance. If none exists, a new one is created with no flags set.
*
* @see UiAutomation
*/
public UiAutomation getUiAutomation() {
if (mUiAutomationConnection != null) {
if (mUiAutomation == null) {
+ return getUiAutomation(0);
+ }
+ return mUiAutomation;
+ }
+ return null;
+ }
+
+ /**
+ * Gets the {@link UiAutomation} instance with flags set.
+ * <p>
+ * <strong>Note:</strong> Only one UiAutomation can be obtained. Calling this method
+ * twice with different flags will fail unless the UiAutomation obtained in the first call
+ * is released with {@link UiAutomation#destroy()}.
+ * </p>
+ * <p>
+ * <strong>Note:</strong> The APIs exposed via the returned {@link UiAutomation}
+ * work across application boundaries while the APIs exposed by the instrumentation
+ * do not. For example, {@link Instrumentation#sendPointerSync(MotionEvent)} will
+ * not allow you to inject the event in an app different from the instrumentation
+ * target, while {@link UiAutomation#injectInputEvent(android.view.InputEvent, boolean)}
+ * will work regardless of the current application.
+ * </p>
+ * <p>
+ * A typical test case should be using either the {@link UiAutomation} or
+ * {@link Instrumentation} APIs. Using both APIs at the same time is not
+ * a mistake by itself but a client has to be aware of the APIs limitations.
+ * </p>
+ *
+ * @param flags The flags to be passed to the UiAutomation, for example
+ * {@link UiAutomation#FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES}.
+ *
+ * @return The UI automation instance.
+ *
+ * @see UiAutomation
+ */
+ public UiAutomation getUiAutomation(int flags) {
+ if (mUiAutomationConnection != null) {
+ if ((mUiAutomation == null) || (mUiAutomation.isDestroyed())) {
mUiAutomation = new UiAutomation(getTargetContext().getMainLooper(),
mUiAutomationConnection);
- mUiAutomation.connect();
+ mUiAutomation.connect(flags);
+ } else {
+ if (mUiAutomation.getFlags() != flags) {
+ throw new RuntimeException(
+ "Cannot get a UiAutomation with different flags from the existing one");
+ }
}
return mUiAutomation;
}
@@ -1861,8 +1904,8 @@
try {
Process.setThreadPriority(Process.THREAD_PRIORITY_URGENT_DISPLAY);
} catch (RuntimeException e) {
- Log.w(TAG, "Exception setting priority of instrumentation thread "
- + Process.myTid(), e);
+ Log.w(TAG, "Exception setting priority of instrumentation thread "
+ + Process.myTid(), e);
}
if (mAutomaticPerformanceSnapshots) {
startPerformanceSnapshot();
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 0f3aad9..7f037f2 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -4384,7 +4384,17 @@
view.addView(com.android.internal.R.id.media_actions, button);
}
}
- handleImage(view /* addPaddingToMainColumn */);
+ handleImage(view);
+ // handle the content margin
+ int endMargin;
+ if (mBuilder.mN.mLargeIcon != null) {
+ endMargin = mBuilder.mContext.getResources().getDimensionPixelSize(
+ R.dimen.notification_content_picture_margin_media);
+ } else {
+ endMargin = mBuilder.mContext.getResources().getDimensionPixelSize(
+ R.dimen.notification_content_margin_end);
+ }
+ view.setViewLayoutMarginEnd(R.id.notification_main_column, endMargin);
return view;
}
diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java
index edafe59..412b098 100644
--- a/core/java/android/app/PendingIntent.java
+++ b/core/java/android/app/PendingIntent.java
@@ -307,7 +307,7 @@
context.getContentResolver()) : null;
try {
intent.migrateExtraStreamToClipData();
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(context);
IIntentSender target =
ActivityManagerNative.getDefault().getIntentSender(
ActivityManager.INTENT_SENDER_ACTIVITY, packageName,
@@ -332,7 +332,7 @@
context.getContentResolver()) : null;
try {
intent.migrateExtraStreamToClipData();
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(context);
IIntentSender target =
ActivityManagerNative.getDefault().getIntentSender(
ActivityManager.INTENT_SENDER_ACTIVITY, packageName,
@@ -446,7 +446,7 @@
String[] resolvedTypes = new String[intents.length];
for (int i=0; i<intents.length; i++) {
intents[i].migrateExtraStreamToClipData();
- intents[i].prepareToLeaveProcess();
+ intents[i].prepareToLeaveProcess(context);
resolvedTypes[i] = intents[i].resolveTypeIfNeeded(context.getContentResolver());
}
try {
@@ -472,7 +472,7 @@
String[] resolvedTypes = new String[intents.length];
for (int i=0; i<intents.length; i++) {
intents[i].migrateExtraStreamToClipData();
- intents[i].prepareToLeaveProcess();
+ intents[i].prepareToLeaveProcess(context);
resolvedTypes[i] = intents[i].resolveTypeIfNeeded(context.getContentResolver());
}
try {
@@ -527,7 +527,7 @@
String resolvedType = intent != null ? intent.resolveTypeIfNeeded(
context.getContentResolver()) : null;
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(context);
IIntentSender target =
ActivityManagerNative.getDefault().getIntentSender(
ActivityManager.INTENT_SENDER_BROADCAST, packageName,
@@ -570,7 +570,7 @@
String resolvedType = intent != null ? intent.resolveTypeIfNeeded(
context.getContentResolver()) : null;
try {
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(context);
IIntentSender target =
ActivityManagerNative.getDefault().getIntentSender(
ActivityManager.INTENT_SENDER_SERVICE, packageName,
diff --git a/core/java/android/app/SharedPreferencesImpl.java b/core/java/android/app/SharedPreferencesImpl.java
index e617553..c552cfc 100644
--- a/core/java/android/app/SharedPreferencesImpl.java
+++ b/core/java/android/app/SharedPreferencesImpl.java
@@ -141,7 +141,7 @@
notifyAll();
}
- private static File makeBackupFile(File prefsFile) {
+ static File makeBackupFile(File prefsFile) {
return new File(prefsFile.getPath() + ".bak");
}
diff --git a/core/java/android/app/UiAutomation.java b/core/java/android/app/UiAutomation.java
index dce2e51..5ec59b4 100644
--- a/core/java/android/app/UiAutomation.java
+++ b/core/java/android/app/UiAutomation.java
@@ -105,6 +105,14 @@
/** Rotation constant: Freeze rotation to 270 degrees . */
public static final int ROTATION_FREEZE_270 = Surface.ROTATION_270;
+ /**
+ * UiAutomation supresses accessibility services by default. This flag specifies that
+ * existing accessibility services should continue to run, and that new ones may start.
+ * This flag is set when obtaining the UiAutomation from
+ * {@link Instrumentation#getUiAutomation(int)}.
+ */
+ public static final int FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES = 0x00000001;
+
private final Object mLock = new Object();
private final ArrayList<AccessibilityEvent> mEventQueue = new ArrayList<AccessibilityEvent>();
@@ -123,6 +131,10 @@
private boolean mIsConnecting;
+ private boolean mIsDestroyed;
+
+ private int mFlags;
+
/**
* Listener for observing the {@link AccessibilityEvent} stream.
*/
@@ -182,11 +194,22 @@
}
/**
- * Connects this UiAutomation to the accessibility introspection APIs.
+ * Connects this UiAutomation to the accessibility introspection APIs with default flags.
*
* @hide
*/
public void connect() {
+ connect(0);
+ }
+
+ /**
+ * Connects this UiAutomation to the accessibility introspection APIs.
+ *
+ * @param flags Any flags to apply to the automation as it gets connected
+ *
+ * @hide
+ */
+ public void connect(int flags) {
synchronized (mLock) {
throwIfConnectedLocked();
if (mIsConnecting) {
@@ -197,7 +220,8 @@
try {
// Calling out without a lock held.
- mUiAutomationConnection.connect(mClient);
+ mUiAutomationConnection.connect(mClient, flags);
+ mFlags = flags;
} catch (RemoteException re) {
throw new RuntimeException("Error while connecting UiAutomation", re);
}
@@ -227,6 +251,17 @@
}
/**
+ * Get the flags used to connect the service.
+ *
+ * @return The flags used to connect
+ *
+ * @hide
+ */
+ public int getFlags() {
+ return mFlags;
+ }
+
+ /**
* Disconnects this UiAutomation from the accessibility introspection APIs.
*
* @hide
@@ -263,6 +298,17 @@
}
/**
+ * Reports if the object has been destroyed
+ *
+ * @return {code true} if the object has been destroyed.
+ *
+ * @hide
+ */
+ public boolean isDestroyed() {
+ return mIsDestroyed;
+ }
+
+ /**
* Sets a callback for observing the stream of {@link AccessibilityEvent}s.
*
* @param listener The callback.
@@ -274,6 +320,15 @@
}
/**
+ * Destroy this UiAutomation. After calling this method, attempting to use the object will
+ * result in errors.
+ */
+ public void destroy() {
+ disconnect();
+ mIsDestroyed = true;
+ }
+
+ /**
* Performs a global action. Such an action can be performed at any moment
* regardless of the current application or user location in that application.
* For example going back, going home, opening recents, etc.
@@ -1033,6 +1088,11 @@
}
@Override
+ public void onSoftKeyboardShowModeChanged(int showMode) {
+ /* do nothing */
+ }
+
+ @Override
public void onPerformGestureResult(int sequence, boolean completedSuccessfully) {
/* do nothing */
}
diff --git a/core/java/android/app/UiAutomationConnection.java b/core/java/android/app/UiAutomationConnection.java
index bd10267..276f774 100644
--- a/core/java/android/app/UiAutomationConnection.java
+++ b/core/java/android/app/UiAutomationConnection.java
@@ -77,7 +77,7 @@
private int mOwningUid;
- public void connect(IAccessibilityServiceClient client) {
+ public void connect(IAccessibilityServiceClient client, int flags) {
if (client == null) {
throw new IllegalArgumentException("Client cannot be null!");
}
@@ -87,7 +87,7 @@
throw new IllegalStateException("Already connected.");
}
mOwningUid = Binder.getCallingUid();
- registerUiTestAutomationServiceLocked(client);
+ registerUiTestAutomationServiceLocked(client, flags);
storeRotationStateLocked();
}
}
@@ -322,7 +322,8 @@
}
}
- private void registerUiTestAutomationServiceLocked(IAccessibilityServiceClient client) {
+ private void registerUiTestAutomationServiceLocked(IAccessibilityServiceClient client,
+ int flags) {
IAccessibilityManager manager = IAccessibilityManager.Stub.asInterface(
ServiceManager.getService(Context.ACCESSIBILITY_SERVICE));
AccessibilityServiceInfo info = new AccessibilityServiceInfo();
@@ -337,7 +338,7 @@
try {
// Calling out with a lock held is fine since if the system
// process is gone the client calling in will be killed.
- manager.registerUiTestAutomationService(mToken, client, info);
+ manager.registerUiTestAutomationService(mToken, client, info, flags);
mClient = client;
} catch (RemoteException re) {
throw new IllegalStateException("Error while registering UiTestAutomationService.", re);
diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java
index f103576..b0ffd21 100644
--- a/core/java/android/app/WallpaperManager.java
+++ b/core/java/android/app/WallpaperManager.java
@@ -64,6 +64,8 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
/**
* Provides access to the system wallpaper. With WallpaperManager, you can
@@ -770,18 +772,26 @@
return 0;
}
final Bundle result = new Bundle();
+ final WallpaperSetCompletion completion = new WallpaperSetCompletion();
try {
Resources resources = mContext.getResources();
/* Set the wallpaper to the default values */
ParcelFileDescriptor fd = sGlobals.mService.setWallpaper(
"res:" + resources.getResourceName(resid),
- mContext.getOpPackageName(), result, which);
+ mContext.getOpPackageName(), null, result, which, completion);
if (fd != null) {
FileOutputStream fos = null;
+ boolean ok = false;
try {
fos = new ParcelFileDescriptor.AutoCloseOutputStream(fd);
copyStreamToWallpaperFile(resources.openRawResource(resid), fos);
+ // The 'close()' is the trigger for any server-side image manipulation,
+ // so we must do that before waiting for completion.
+ fos.close();
+ completion.waitForCompletion();
} finally {
+ // Might be redundant but completion shouldn't wait unless the write
+ // succeeded; this is a fallback if it threw past the close+wait.
IoUtils.closeQuietly(fos);
}
}
@@ -876,14 +886,17 @@
return 0;
}
final Bundle result = new Bundle();
+ final WallpaperSetCompletion completion = new WallpaperSetCompletion();
try {
ParcelFileDescriptor fd = sGlobals.mService.setWallpaper(null,
- mContext.getOpPackageName(), result, which);
+ mContext.getOpPackageName(), visibleCropHint, result, which, completion);
if (fd != null) {
FileOutputStream fos = null;
try {
fos = new ParcelFileDescriptor.AutoCloseOutputStream(fd);
fullImage.compress(Bitmap.CompressFormat.PNG, 90, fos);
+ fos.close();
+ completion.waitForCompletion();
} finally {
IoUtils.closeQuietly(fos);
}
@@ -990,14 +1003,17 @@
return 0;
}
final Bundle result = new Bundle();
+ final WallpaperSetCompletion completion = new WallpaperSetCompletion();
try {
ParcelFileDescriptor fd = sGlobals.mService.setWallpaper(null,
- mContext.getOpPackageName(), result, which);
+ mContext.getOpPackageName(), visibleCropHint, result, which, completion);
if (fd != null) {
FileOutputStream fos = null;
try {
fos = new ParcelFileDescriptor.AutoCloseOutputStream(fd);
copyStreamToWallpaperFile(bitmapData, fos);
+ fos.close();
+ completion.waitForCompletion();
} finally {
IoUtils.closeQuietly(fos);
}
@@ -1385,4 +1401,28 @@
return null;
}
+
+ // Private completion callback for setWallpaper() synchronization
+ private class WallpaperSetCompletion extends IWallpaperManagerCallback.Stub {
+ final CountDownLatch mLatch;
+
+ public WallpaperSetCompletion() {
+ mLatch = new CountDownLatch(1);
+ }
+
+ public void waitForCompletion() {
+ try {
+ mLatch.await(30, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ // This might be legit: the crop may take a very long time. Don't sweat
+ // it in that case; we are okay with display lagging behind in order to
+ // keep the caller from locking up indeterminately.
+ }
+ }
+
+ @Override
+ public void onWallpaperChanged() throws RemoteException {
+ mLatch.countDown();
+ }
+ }
}
diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java
index 3c1ecc7..34dfb26 100644
--- a/core/java/android/app/admin/DeviceAdminReceiver.java
+++ b/core/java/android/app/admin/DeviceAdminReceiver.java
@@ -266,6 +266,14 @@
"android.app.action.BUGREPORT_SHARE";
/**
+ * Broadcast action: notify that a new batch of device logs is ready to be collected.
+ * @hide
+ */
+ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
+ public static final String ACTION_SECURITY_LOGS_AVAILABLE
+ = "android.app.action.SECURITY_LOGS_AVAILABLE";
+
+ /**
* A string containing the SHA-256 hash of the bugreport file.
*
* @see #ACTION_BUGREPORT_SHARE
@@ -596,6 +604,18 @@
}
/**
+ * Called when a new batch of device logs can be retrieved.
+ *
+ * <p>This callback is only applicable to device owners.
+ *
+ * @param context The running context as per {@link #onReceive}.
+ * @param intent The received intent as per {@link #onReceive}.
+ * @see DevicePolicyManager#retrieveDeviceLogs(ComponentName)
+ */
+ public void onSecurityLogsAvailable(Context context, Intent intent) {
+ }
+
+ /**
* Intercept standard device administrator broadcasts. Implementations
* should not override this method; it is better to implement the
* convenience callbacks for each action.
@@ -647,6 +667,8 @@
int failureCode = intent.getIntExtra(EXTRA_BUGREPORT_FAILURE_REASON,
BUGREPORT_FAILURE_FAILED_COMPLETING);
onBugreportFailed(context, intent, failureCode);
+ } else if (ACTION_SECURITY_LOGS_AVAILABLE.equals(action)) {
+ onSecurityLogsAvailable(context, intent);
}
}
}
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index a3c615d..f04e76e 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -23,13 +23,17 @@
import android.annotation.SdkConstant.SdkConstantType;
import android.annotation.SystemApi;
import android.app.Activity;
+import android.auditing.SecurityLog;
+import android.auditing.SecurityLog.SecurityEvent;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
+import android.content.pm.ParceledListSlice;
import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
import android.graphics.Bitmap;
import android.net.ProxyInfo;
import android.net.Uri;
@@ -2209,7 +2213,6 @@
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_START_ENCRYPTION
= "android.app.action.START_ENCRYPTION";
-
/**
* Widgets are enabled in keyguard
*/
@@ -3345,6 +3348,10 @@
* <p>If the device owner information contains only whitespaces then the message on the lock
* screen will be blank and the user will not be allowed to change it.
*
+ * <p>If the device owner information needs to be localized, it is the responsibility of the
+ * {@link DeviceAdminReceiver} to listen to the {@link Intent#ACTION_LOCALE_CHANGED} broadcast
+ * and set a new version of this string accordingly.
+ *
* @param admin The name of the admin component to check.
* @param info Device owner information which will be displayed instead of the user
* owner info.
@@ -5210,6 +5217,10 @@
* for support."
* If the message is longer than 200 characters it may be truncated.
*
+ * <p>If the short support message needs to be localized, it is the responsibility of the
+ * {@link DeviceAdminReceiver} to listen to the {@link Intent#ACTION_LOCALE_CHANGED} broadcast
+ * and set a new version of this string accordingly.
+ *
* @see #setLongSupportMessage
*
* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
@@ -5249,6 +5260,10 @@
* Called by a device admin to set the long support message. This will
* be displayed to the user in the device administators settings screen.
*
+ * <p>If the long support message needs to be localized, it is the responsibility of the
+ * {@link DeviceAdminReceiver} to listen to the {@link Intent#ACTION_LOCALE_CHANGED} broadcast
+ * and set a new version of this string accordingly.
+ *
* @see #setShortSupportMessage
*
* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
@@ -5339,6 +5354,66 @@
throw new SecurityException("The current user does not have a parent profile.");
}
return new DevicePolicyManager(mContext, true);
+ } catch (RemoteException e) {
+ Log.w(TAG, REMOTE_EXCEPTION_MESSAGE, e);
+ return null;
+ }
+ }
+
+ /**
+ * Called by device owner to control the device logging feature. Logging can only be
+ * enabled on single user devices where the sole user is managed by the device owner.
+ *
+ * <p> Device logs contain various information intended for security auditing purposes.
+ * See {@link SecurityEvent} for details.
+ *
+ * @param admin Which device owner this request is associated with.
+ * @param enabled whether device logging should be enabled or not.
+ * @see #retrieveDeviceLogs
+ */
+ public void setDeviceLoggingEnabled(@NonNull ComponentName admin, boolean enabled) {
+ try {
+ mService.setDeviceLoggingEnabled(admin, enabled);
+ } catch (RemoteException re) {
+ Log.w(TAG, REMOTE_EXCEPTION_MESSAGE, re);
+ }
+ }
+
+ /**
+ * Return whether device logging is enabled or not by the device owner.
+ *
+ * @param admin Which device owner this request is associated with.
+ * @return {@code true} if device logging is enabled by device owner, {@code false} otherwise.
+ */
+ public boolean getDeviceLoggingEnabled(@NonNull ComponentName admin) {
+ try {
+ return mService.getDeviceLoggingEnabled(admin);
+ } catch (RemoteException re) {
+ Log.w(TAG, REMOTE_EXCEPTION_MESSAGE, re);
+ return false;
+ }
+ }
+
+ /**
+ * Called by device owner to retrieve all new device logging entries since the last call to
+ * this API after device boots.
+ *
+ * <p> Access to the logs is rate limited and it will only return new logs after the device
+ * owner has been notified via {@link DeviceAdminReceiver#onSecurityLogsAvailable}.
+ *
+ * @param admin Which device owner this request is associated with.
+ * @return the new batch of device logs which is a list of {@link SecurityEvent},
+ * or {@code null} if rate limitation is exceeded or if logging is currently disabled.
+ */
+ public List<SecurityEvent> retrieveDeviceLogs(@NonNull ComponentName admin) {
+ try {
+ ParceledListSlice<SecurityEvent> list = mService.retrieveDeviceLogs(admin);
+ if (list != null) {
+ return list.getList();
+ } else {
+ // Rate limit exceeded.
+ return null;
+ }
} catch (RemoteException re) {
Log.w(TAG, REMOTE_EXCEPTION_MESSAGE, re);
return null;
@@ -5346,6 +5421,44 @@
}
/**
+ * Called by the system to obtain a {@link DevicePolicyManager} whose calls act on the parent
+ * profile.
+ *
+ * @hide
+ */
+ public DevicePolicyManager getParentProfileInstance(UserInfo uInfo) {
+ mContext.checkSelfPermission(
+ android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);
+ if (!uInfo.isManagedProfile()) {
+ throw new SecurityException("The user " + uInfo.id
+ + " does not have a parent profile.");
+ }
+ return new DevicePolicyManager(mContext, true);
+ }
+
+ /**
+ * Called by device owners to retrieve device logs from before the device's last reboot.
+ *
+ * <p>
+ * <strong> The device logs are retrieved from a RAM region which is not guaranteed to be
+ * corruption-free during power cycles, due to hardware variations and limitations. As a
+ * result, this API is provided as best-effort and the returned logs may contain corrupted data.
+ * </strong>
+ *
+ * @param admin Which device owner this request is associated with.
+ * @return Device logs from before the latest reboot of the system.
+ */
+ public List<SecurityEvent> retrievePreviousDeviceLogs(@NonNull ComponentName admin) {
+ try {
+ ParceledListSlice<SecurityEvent> list = mService.retrievePreviousDeviceLogs(admin);
+ return list.getList();
+ } catch (RemoteException re) {
+ Log.w(TAG, REMOTE_EXCEPTION_MESSAGE, re);
+ return Collections.<SecurityEvent>emptyList();
+ }
+ }
+
+ /**
* Called by a profile owner of a managed profile to set the color used for customization.
* This color is used as background color of the confirm credentials screen for that user.
* The default color is {@link android.graphics.Color#GRAY}.
@@ -5397,6 +5510,58 @@
}
/**
+ * Called by a profile owner of a managed profile to set the name of the organization under
+ * management.
+ *
+ * <p>If the organization name needs to be localized, it is the responsibility of the
+ * {@link DeviceAdminReceiver} to listen to the {@link Intent#ACTION_LOCALE_CHANGED} broadcast
+ * and set a new version of this string accordingly.
+ *
+ * @param admin Which {@link DeviceAdminReceiver} this request is associated with.
+ * @param title The organization name or {@code null} to clear a previously set name.
+ */
+ public void setOrganizationName(@NonNull ComponentName admin, @Nullable String title) {
+ try {
+ mService.setOrganizationName(admin, title);
+ } catch (RemoteException re) {
+ Log.w(TAG, REMOTE_EXCEPTION_MESSAGE);
+ }
+ }
+
+ /**
+ * Called by a profile owner of a managed profile to retrieve the name of the organization
+ * under management.
+ *
+ * @param admin Which {@link DeviceAdminReceiver} this request is associated with.
+ * @return The organization name or {@code null} if none is set.
+ */
+ public String getOrganizationName(@NonNull ComponentName admin) {
+ try {
+ return mService.getOrganizationName(admin);
+ } catch (RemoteException re) {
+ Log.w(TAG, REMOTE_EXCEPTION_MESSAGE);
+ return null;
+ }
+ }
+
+ /**
+ * Retrieve the default title message used in the confirm credentials screen for a given user.
+ *
+ * @param userHandle The user id of the user we're interested in.
+ * @return The organization name or {@code null} if none is set.
+ *
+ * @hide
+ */
+ public String getOrganizationNameForUser(int userHandle) {
+ try {
+ return mService.getOrganizationNameForUser(userHandle);
+ } catch (RemoteException re) {
+ Log.w(TAG, REMOTE_EXCEPTION_MESSAGE);
+ return null;
+ }
+ }
+
+ /**
* @return the {@link UserProvisioningState} for the current user - for unmanaged users will
* return {@link #STATE_USER_UNMANAGED}
* @hide
diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl
index 6333013..b57e1b7 100644
--- a/core/java/android/app/admin/IDevicePolicyManager.aidl
+++ b/core/java/android/app/admin/IDevicePolicyManager.aidl
@@ -21,6 +21,7 @@
import android.content.ComponentName;
import android.content.Intent;
import android.content.IntentFilter;
+import android.content.pm.ParceledListSlice;
import android.graphics.Bitmap;
import android.net.ProxyInfo;
import android.net.Uri;
@@ -276,9 +277,18 @@
int getOrganizationColor(in ComponentName admin);
int getOrganizationColorForUser(int userHandle);
+ void setOrganizationName(in ComponentName admin, in String title);
+ String getOrganizationName(in ComponentName admin);
+ String getOrganizationNameForUser(int userHandle);
+
int getUserProvisioningState();
void setUserProvisioningState(int state, int userHandle);
void setAffiliationIds(in ComponentName admin, in List<String> ids);
boolean isAffiliatedUser();
+
+ void setDeviceLoggingEnabled(in ComponentName admin, boolean enabled);
+ boolean getDeviceLoggingEnabled(in ComponentName admin);
+ ParceledListSlice retrieveDeviceLogs(in ComponentName admin);
+ ParceledListSlice retrievePreviousDeviceLogs(in ComponentName admin);
}
diff --git a/core/java/android/app/backup/BackupManager.java b/core/java/android/app/backup/BackupManager.java
index ff62b7c..2268400 100644
--- a/core/java/android/app/backup/BackupManager.java
+++ b/core/java/android/app/backup/BackupManager.java
@@ -538,7 +538,7 @@
@Override
public void onResult(String currentPackage, int status) {
mHandler.sendMessage(
- mHandler.obtainMessage(MSG_FINISHED, status, 0, currentPackage));
+ mHandler.obtainMessage(MSG_RESULT, status, 0, currentPackage));
}
@Override
diff --git a/core/java/android/app/usage/NetworkStats.java b/core/java/android/app/usage/NetworkStats.java
index d263646..5622207 100644
--- a/core/java/android/app/usage/NetworkStats.java
+++ b/core/java/android/app/usage/NetworkStats.java
@@ -151,21 +151,6 @@
public static final int UID_TETHERING = TrafficStats.UID_TETHERING;
/**
- * Combined usage across all metering states.
- */
- public static final int METERING_ALL = -1;
-
- /**
- * Usage not accounted for in any other metering state.
- */
- public static final int METERING_DEFAULT = 0x1;
-
- /**
- * Metered usage.
- */
- public static final int METERING_METERED = 0x2;
-
- /**
* Combined usage across all roaming states.
*/
public static final int ROAMING_ALL = -1;
@@ -182,7 +167,6 @@
private int mUid;
private int mState;
- private int mMetering;
private int mRoaming;
private long mBeginTimeStamp;
private long mEndTimeStamp;
@@ -247,18 +231,6 @@
}
/**
- * Metering state. One of the following values:<p/>
- * <ul>
- * <li>{@link #METERING_ALL}</li>
- * <li>{@link #METERING_DEFAULT}</li>
- * <li>{@link #METERING_METERED}</li>
- * </ul>
- */
- public int getMetering() {
- return mMetering;
- }
-
- /**
* Roaming state. One of the following values:<p/>
* <ul>
* <li>{@link #ROAMING_ALL}</li>
@@ -463,8 +435,6 @@
private void fillBucketFromSummaryEntry(Bucket bucketOut) {
bucketOut.mUid = Bucket.convertUid(mRecycledSummaryEntry.uid);
bucketOut.mState = Bucket.convertState(mRecycledSummaryEntry.set);
- // TODO: Implement metering tracking.
- bucketOut.mMetering = Bucket.METERING_ALL;
bucketOut.mRoaming = Bucket.convertRoaming(mRecycledSummaryEntry.roaming);
bucketOut.mBeginTimeStamp = mStartTimeStamp;
bucketOut.mEndTimeStamp = mEndTimeStamp;
@@ -512,7 +482,6 @@
mRecycledHistoryEntry);
bucketOut.mUid = Bucket.convertUid(getUid());
bucketOut.mState = Bucket.STATE_ALL;
- bucketOut.mMetering = Bucket.METERING_ALL;
bucketOut.mRoaming = Bucket.ROAMING_ALL;
bucketOut.mBeginTimeStamp = mRecycledHistoryEntry.bucketStart;
bucketOut.mEndTimeStamp = mRecycledHistoryEntry.bucketStart +
diff --git a/core/java/android/app/usage/UsageStats.java b/core/java/android/app/usage/UsageStats.java
index 0fce4e2..a88aa3125 100644
--- a/core/java/android/app/usage/UsageStats.java
+++ b/core/java/android/app/usage/UsageStats.java
@@ -165,14 +165,18 @@
mPackageName + "' with UsageStats for package '" + right.mPackageName + "'.");
}
- if (right.mEndTimeStamp > mEndTimeStamp) {
+ if (right.mBeginTimeStamp > mBeginTimeStamp) {
+ // The incoming UsageStat begins after this one, so use its last time used fields
+ // as the source of truth.
+ // We use the mBeginTimeStamp due to a bug where UsageStats files can overlap with
+ // regards to their mEndTimeStamp.
mLastEvent = right.mLastEvent;
- mEndTimeStamp = right.mEndTimeStamp;
mLastTimeUsed = right.mLastTimeUsed;
mBeginIdleTime = right.mBeginIdleTime;
mLastTimeSystemUsed = right.mLastTimeSystemUsed;
}
mBeginTimeStamp = Math.min(mBeginTimeStamp, right.mBeginTimeStamp);
+ mEndTimeStamp = Math.max(mEndTimeStamp, right.mEndTimeStamp);
mTotalTimeInForeground += right.mTotalTimeInForeground;
mLaunchCount += right.mLaunchCount;
}
diff --git a/core/java/android/content/BroadcastReceiver.java b/core/java/android/content/BroadcastReceiver.java
index 2260d7e..10e6fb2 100644
--- a/core/java/android/content/BroadcastReceiver.java
+++ b/core/java/android/content/BroadcastReceiver.java
@@ -522,7 +522,7 @@
IActivityManager am = ActivityManagerNative.getDefault();
IBinder binder = null;
try {
- service.prepareToLeaveProcess();
+ service.prepareToLeaveProcess(myContext);
binder = am.peekService(service, service.resolveTypeIfNeeded(
myContext.getContentResolver()), myContext.getOpPackageName());
} catch (RemoteException e) {
diff --git a/core/java/android/content/ClipData.java b/core/java/android/content/ClipData.java
index 6dfefac..0ec58ea 100644
--- a/core/java/android/content/ClipData.java
+++ b/core/java/android/content/ClipData.java
@@ -823,14 +823,14 @@
*
* @hide
*/
- public void prepareToLeaveProcess() {
+ public void prepareToLeaveProcess(boolean leavingPackage) {
final int size = mItems.size();
for (int i = 0; i < size; i++) {
final Item item = mItems.get(i);
if (item.mIntent != null) {
- item.mIntent.prepareToLeaveProcess();
+ item.mIntent.prepareToLeaveProcess(leavingPackage);
}
- if (item.mUri != null && StrictMode.vmFileUriExposureEnabled()) {
+ if (item.mUri != null && StrictMode.vmFileUriExposureEnabled() && leavingPackage) {
item.mUri.checkFileUriExposed("ClipData.Item.getUri()");
}
}
diff --git a/core/java/android/content/ClipboardManager.java b/core/java/android/content/ClipboardManager.java
index 5653cad..e67da2b 100644
--- a/core/java/android/content/ClipboardManager.java
+++ b/core/java/android/content/ClipboardManager.java
@@ -118,7 +118,7 @@
public void setPrimaryClip(ClipData clip) {
try {
if (clip != null) {
- clip.prepareToLeaveProcess();
+ clip.prepareToLeaveProcess(true);
}
getService().setPrimaryClip(clip, mContext.getOpPackageName());
} catch (RemoteException e) {
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 3142b40..622aad9 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -48,7 +48,6 @@
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
-import android.os.HardwarePropertiesManager;
import android.os.IBinder;
import android.os.Looper;
import android.os.StatFs;
@@ -83,40 +82,49 @@
* File creation mode: the default mode, where the created file can only
* be accessed by the calling application (or all applications sharing the
* same user ID).
- * @see #MODE_WORLD_READABLE
- * @see #MODE_WORLD_WRITEABLE
*/
public static final int MODE_PRIVATE = 0x0000;
+
/**
+ * File creation mode: allow all other applications to have read access to
+ * the created file.
+ * <p>
+ * As of {@link android.os.Build.VERSION_CODES#N} attempting to use this
+ * mode will throw a {@link SecurityException}.
+ *
* @deprecated Creating world-readable files is very dangerous, and likely
- * to cause security holes in applications. It is strongly discouraged;
- * instead, applications should use more formal mechanism for interactions
- * such as {@link ContentProvider}, {@link BroadcastReceiver}, and
- * {@link android.app.Service}. There are no guarantees that this
- * access mode will remain on a file, such as when it goes through a
- * backup and restore.
- * File creation mode: allow all other applications to have read access
- * to the created file.
- * @see #MODE_PRIVATE
- * @see #MODE_WORLD_WRITEABLE
+ * to cause security holes in applications. It is strongly
+ * discouraged; instead, applications should use more formal
+ * mechanism for interactions such as {@link ContentProvider},
+ * {@link BroadcastReceiver}, and {@link android.app.Service}.
+ * There are no guarantees that this access mode will remain on
+ * a file, such as when it goes through a backup and restore.
+ * @see android.support.v4.content.FileProvider
+ * @see Intent#FLAG_GRANT_WRITE_URI_PERMISSION
*/
@Deprecated
public static final int MODE_WORLD_READABLE = 0x0001;
+
/**
+ * File creation mode: allow all other applications to have write access to
+ * the created file.
+ * <p>
+ * As of {@link android.os.Build.VERSION_CODES#N} attempting to use this
+ * mode will throw a {@link SecurityException}.
+ *
* @deprecated Creating world-writable files is very dangerous, and likely
- * to cause security holes in applications. It is strongly discouraged;
- * instead, applications should use more formal mechanism for interactions
- * such as {@link ContentProvider}, {@link BroadcastReceiver}, and
- * {@link android.app.Service}. There are no guarantees that this
- * access mode will remain on a file, such as when it goes through a
- * backup and restore.
- * File creation mode: allow all other applications to have write access
- * to the created file.
- * @see #MODE_PRIVATE
- * @see #MODE_WORLD_READABLE
+ * to cause security holes in applications. It is strongly
+ * discouraged; instead, applications should use more formal
+ * mechanism for interactions such as {@link ContentProvider},
+ * {@link BroadcastReceiver}, and {@link android.app.Service}.
+ * There are no guarantees that this access mode will remain on
+ * a file, such as when it goes through a backup and restore.
+ * @see android.support.v4.content.FileProvider
+ * @see Intent#FLAG_GRANT_WRITE_URI_PERMISSION
*/
@Deprecated
public static final int MODE_WORLD_WRITEABLE = 0x0002;
+
/**
* File creation mode: for use with {@link #openFileOutput}, if the file
* already exists then write data to the end of the existing file
@@ -658,15 +666,12 @@
* does not exist, it will be created when you retrieve an
* editor (SharedPreferences.edit()) and then commit changes (Editor.commit()).
* @param mode Operating mode. Use 0 or {@link #MODE_PRIVATE} for the
- * default operation, {@link #MODE_WORLD_READABLE}
- * and {@link #MODE_WORLD_WRITEABLE} to control permissions.
+ * default operation.
*
* @return The single {@link SharedPreferences} instance that can be used
* to retrieve and modify the preference values.
*
* @see #MODE_PRIVATE
- * @see #MODE_WORLD_READABLE
- * @see #MODE_WORLD_WRITEABLE
*/
public abstract SharedPreferences getSharedPreferences(String name, int mode);
@@ -681,20 +686,44 @@
* does not exist, it will be created when you retrieve an
* editor (SharedPreferences.edit()) and then commit changes (Editor.commit()).
* @param mode Operating mode. Use 0 or {@link #MODE_PRIVATE} for the
- * default operation, {@link #MODE_WORLD_READABLE}
- * and {@link #MODE_WORLD_WRITEABLE} to control permissions.
+ * default operation.
*
* @return The single {@link SharedPreferences} instance that can be used
* to retrieve and modify the preference values.
*
* @see #getSharedPreferencesPath(String)
* @see #MODE_PRIVATE
- * @see #MODE_WORLD_READABLE
- * @see #MODE_WORLD_WRITEABLE
*/
public abstract SharedPreferences getSharedPreferences(File file, int mode);
/**
+ * Migrate an existing shared preferences file from the given source storage
+ * context to this context. This is typically used to migrate data between
+ * storage locations after an upgrade, such as migrating from credential
+ * encrypted to device encrypted storage.
+ *
+ * @param sourceContext The source context which contains the existing
+ * shared preferences to migrate.
+ * @param name The name of the shared preferences file.
+ * @return {@code true} if the migration was successful or if the shared
+ * preferences didn't exist in the source context, otherwise
+ * {@code false}.
+ * @see #createDeviceEncryptedStorageContext()
+ */
+ public abstract boolean migrateSharedPreferencesFrom(Context sourceContext, String name);
+
+ /**
+ * Delete an existing shared preferences file.
+ *
+ * @param name The name (unique in the application package) of the shared
+ * preferences file.
+ * @return {@code true} if the shared preferences file was successfully
+ * deleted; else {@code false}.
+ * @see #getSharedPreferences(String, int)
+ */
+ public abstract boolean deleteSharedPreferences(String name);
+
+ /**
* Open a private file associated with this Context's application package
* for reading.
*
@@ -721,14 +750,11 @@
* @param name The name of the file to open; can not contain path
* separators.
* @param mode Operating mode. Use 0 or {@link #MODE_PRIVATE} for the
- * default operation, {@link #MODE_APPEND} to append to an
- * existing file, {@link #MODE_WORLD_READABLE} and
- * {@link #MODE_WORLD_WRITEABLE} to control permissions.
+ * default operation. Use {@link #MODE_APPEND} to append to an
+ * existing file.
* @return The resulting {@link FileOutputStream}.
* @see #MODE_APPEND
* @see #MODE_PRIVATE
- * @see #MODE_WORLD_READABLE
- * @see #MODE_WORLD_WRITEABLE
* @see #openFileInput
* @see #fileList
* @see #deleteFile
@@ -1289,8 +1315,7 @@
* @param name Name of the directory to retrieve. This is a directory
* that is created as part of your application data.
* @param mode Operating mode. Use 0 or {@link #MODE_PRIVATE} for the
- * default operation, {@link #MODE_WORLD_READABLE} and
- * {@link #MODE_WORLD_WRITEABLE} to control permissions.
+ * default operation.
*
* @return A {@link File} object for the requested directory. The directory
* will have been created if it does not already exist.
@@ -1301,23 +1326,20 @@
/**
* Open a new private SQLiteDatabase associated with this Context's
- * application package. Create the database file if it doesn't exist.
+ * application package. Create the database file if it doesn't exist.
*
* @param name The name (unique in the application package) of the database.
- * @param mode Operating mode. Use 0 or {@link #MODE_PRIVATE} for the
- * default operation, {@link #MODE_WORLD_READABLE}
- * and {@link #MODE_WORLD_WRITEABLE} to control permissions.
- * Use {@link #MODE_ENABLE_WRITE_AHEAD_LOGGING} to enable write-ahead logging by default.
- * Use {@link #MODE_NO_LOCALIZED_COLLATORS} to disable localized collators.
+ * @param mode Operating mode. Use 0 or {@link #MODE_PRIVATE} for the
+ * default operation. Use
+ * {@link #MODE_ENABLE_WRITE_AHEAD_LOGGING} to enable write-ahead
+ * logging by default. Use {@link #MODE_NO_LOCALIZED_COLLATORS}
+ * to disable localized collators.
* @param factory An optional factory class that is called to instantiate a
- * cursor when query is called.
- *
+ * cursor when query is called.
* @return The contents of a newly created database with the given name.
- * @throws android.database.sqlite.SQLiteException if the database file could not be opened.
- *
+ * @throws android.database.sqlite.SQLiteException if the database file
+ * could not be opened.
* @see #MODE_PRIVATE
- * @see #MODE_WORLD_READABLE
- * @see #MODE_WORLD_WRITEABLE
* @see #MODE_ENABLE_WRITE_AHEAD_LOGGING
* @see #MODE_NO_LOCALIZED_COLLATORS
* @see #deleteDatabase
@@ -1327,27 +1349,28 @@
/**
* Open a new private SQLiteDatabase associated with this Context's
- * application package. Creates the database file if it doesn't exist.
- *
- * <p>Accepts input param: a concrete instance of {@link DatabaseErrorHandler} to be
- * used to handle corruption when sqlite reports database corruption.</p>
+ * application package. Creates the database file if it doesn't exist.
+ * <p>
+ * Accepts input param: a concrete instance of {@link DatabaseErrorHandler}
+ * to be used to handle corruption when sqlite reports database corruption.
+ * </p>
*
* @param name The name (unique in the application package) of the database.
- * @param mode Operating mode. Use 0 or {@link #MODE_PRIVATE} for the
- * default operation, {@link #MODE_WORLD_READABLE}
- * and {@link #MODE_WORLD_WRITEABLE} to control permissions.
- * Use {@link #MODE_ENABLE_WRITE_AHEAD_LOGGING} to enable write-ahead logging by default.
- * Use {@link #MODE_NO_LOCALIZED_COLLATORS} to disable localized collators.
+ * @param mode Operating mode. Use 0 or {@link #MODE_PRIVATE} for the
+ * default operation. Use
+ * {@link #MODE_ENABLE_WRITE_AHEAD_LOGGING} to enable write-ahead
+ * logging by default. Use {@link #MODE_NO_LOCALIZED_COLLATORS}
+ * to disable localized collators.
* @param factory An optional factory class that is called to instantiate a
- * cursor when query is called.
- * @param errorHandler the {@link DatabaseErrorHandler} to be used when sqlite reports database
- * corruption. if null, {@link android.database.DefaultDatabaseErrorHandler} is assumed.
+ * cursor when query is called.
+ * @param errorHandler the {@link DatabaseErrorHandler} to be used when
+ * sqlite reports database corruption. if null,
+ * {@link android.database.DefaultDatabaseErrorHandler} is
+ * assumed.
* @return The contents of a newly created database with the given name.
- * @throws android.database.sqlite.SQLiteException if the database file could not be opened.
- *
+ * @throws android.database.sqlite.SQLiteException if the database file
+ * could not be opened.
* @see #MODE_PRIVATE
- * @see #MODE_WORLD_READABLE
- * @see #MODE_WORLD_WRITEABLE
* @see #MODE_ENABLE_WRITE_AHEAD_LOGGING
* @see #MODE_NO_LOCALIZED_COLLATORS
* @see #deleteDatabase
@@ -1357,6 +1380,21 @@
@Nullable DatabaseErrorHandler errorHandler);
/**
+ * Migrate an existing database file from the given source storage context
+ * to this context. This is typically used to migrate data between storage
+ * locations after an upgrade, such as migrating from credential encrypted
+ * to device encrypted storage.
+ *
+ * @param sourceContext The source context which contains the existing
+ * database to migrate.
+ * @param name The name of the database file.
+ * @return {@code true} if the migration was successful or if the database
+ * didn't exist in the source context, otherwise {@code false}.
+ * @see #createDeviceEncryptedStorageContext()
+ */
+ public abstract boolean migrateDatabaseFrom(Context sourceContext, String name);
+
+ /**
* Delete an existing private SQLiteDatabase associated with this Context's
* application package.
*
diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java
index c99ddc8..61b87a9 100644
--- a/core/java/android/content/ContextWrapper.java
+++ b/core/java/android/content/ContextWrapper.java
@@ -170,6 +170,16 @@
}
@Override
+ public boolean migrateSharedPreferencesFrom(Context sourceContext, String name) {
+ return mBase.migrateSharedPreferencesFrom(sourceContext, name);
+ }
+
+ @Override
+ public boolean deleteSharedPreferences(String name) {
+ return mBase.deleteSharedPreferences(name);
+ }
+
+ @Override
public FileInputStream openFileInput(String name)
throws FileNotFoundException {
return mBase.openFileInput(name);
@@ -273,6 +283,11 @@
}
@Override
+ public boolean migrateDatabaseFrom(Context sourceContext, String name) {
+ return mBase.migrateDatabaseFrom(sourceContext, name);
+ }
+
+ @Override
public boolean deleteDatabase(String name) {
return mBase.deleteDatabase(name);
}
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 49b8363..83943ad 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -2575,16 +2575,6 @@
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_MEDIA_BUTTON = "android.intent.action.MEDIA_BUTTON";
- /**
- * Broadcast Action: The "Picture-in-picture (PIP) Button" was pressed.
- * Includes a single extra field, {@link #EXTRA_KEY_EVENT}, containing the key event that
- * caused the broadcast.
- * @hide
- */
- @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
- public static final String ACTION_PICTURE_IN_PICTURE_BUTTON =
- "android.intent.action.PICTURE_IN_PICTURE_BUTTON";
-
/**
* Broadcast Action: The "Camera Button" was pressed. Includes a single
* extra field, {@link #EXTRA_KEY_EVENT}, containing the key event that
@@ -4587,11 +4577,11 @@
public static final int FLAG_ACTIVITY_RETAIN_IN_RECENTS = 0x00002000;
/**
- * This flag is only used in the multi-window mode. The new activity will be displayed on
- * the other side than the one that is launching it. This can only be used in conjunction with
+ * This flag is only used in split-screen multi-window mode. The new activity will be displayed
+ * adjacent to the one launching it. This can only be used in conjunction with
* {@link #FLAG_ACTIVITY_NEW_TASK}.
*/
- public static final int FLAG_ACTIVITY_LAUNCH_TO_SIDE = 0x00001000;
+ public static final int FLAG_ACTIVITY_LAUNCH_ADJACENT = 0x00001000;
/**
* If set, when sending a broadcast only registered receivers will be
@@ -8912,23 +8902,47 @@
*
* @hide
*/
- public void prepareToLeaveProcess() {
+ public void prepareToLeaveProcess(Context context) {
+ final boolean leavingPackage = (mComponent == null)
+ || !Objects.equals(mComponent.getPackageName(), context.getPackageName());
+ prepareToLeaveProcess(leavingPackage);
+ }
+
+ /**
+ * Prepare this {@link Intent} to leave an app process.
+ *
+ * @hide
+ */
+ public void prepareToLeaveProcess(boolean leavingPackage) {
setAllowFds(false);
if (mSelector != null) {
- mSelector.prepareToLeaveProcess();
+ mSelector.prepareToLeaveProcess(leavingPackage);
}
if (mClipData != null) {
- mClipData.prepareToLeaveProcess();
+ mClipData.prepareToLeaveProcess(leavingPackage);
}
- if (mData != null && StrictMode.vmFileUriExposureEnabled()) {
- // There are several ACTION_MEDIA_* broadcasts that send file://
- // Uris, so only check common actions.
- if (ACTION_VIEW.equals(mAction) ||
- ACTION_EDIT.equals(mAction) ||
- ACTION_ATTACH_DATA.equals(mAction)) {
- mData.checkFileUriExposed("Intent.getData()");
+ if (mAction != null && mData != null && StrictMode.vmFileUriExposureEnabled()
+ && leavingPackage) {
+ switch (mAction) {
+ case ACTION_MEDIA_REMOVED:
+ case ACTION_MEDIA_UNMOUNTED:
+ case ACTION_MEDIA_CHECKING:
+ case ACTION_MEDIA_NOFS:
+ case ACTION_MEDIA_MOUNTED:
+ case ACTION_MEDIA_SHARED:
+ case ACTION_MEDIA_UNSHARED:
+ case ACTION_MEDIA_BAD_REMOVAL:
+ case ACTION_MEDIA_UNMOUNTABLE:
+ case ACTION_MEDIA_EJECT:
+ case ACTION_MEDIA_SCANNER_STARTED:
+ case ACTION_MEDIA_SCANNER_FINISHED:
+ case ACTION_MEDIA_SCANNER_SCAN_FILE:
+ // Ignore legacy actions
+ break;
+ default:
+ mData.checkFileUriExposed("Intent.getData()");
}
}
}
diff --git a/core/java/android/content/SharedPreferences.java b/core/java/android/content/SharedPreferences.java
index 1d16516..7f9e176 100644
--- a/core/java/android/content/SharedPreferences.java
+++ b/core/java/android/content/SharedPreferences.java
@@ -30,8 +30,7 @@
* when they are committed to storage. Objects that are returned from the
* various <code>get</code> methods must be treated as immutable by the application.
*
- * <p><em>Note: currently this class does not support use across multiple
- * processes. This will be added later.</em>
+ * <p><em>Note: This class does not support use across multiple processes.</em>
*
* <div class="special reference">
* <h3>Developer Guides</h3>
diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java
index dedf07f5..43a0cc7 100644
--- a/core/java/android/content/pm/ActivityInfo.java
+++ b/core/java/android/content/pm/ActivityInfo.java
@@ -156,6 +156,35 @@
public String targetActivity;
/**
+ * Activity can not be resized and always occupies the fullscreen area with all windows fully
+ * visible.
+ * @hide
+ */
+ public static final int RESIZE_MODE_UNRESIZEABLE = 0;
+ /**
+ * Activity can not be resized and always occupies the fullscreen area with all windows cropped
+ * to either the task or stack bounds.
+ * @hide
+ */
+ public static final int RESIZE_MODE_CROP_WINDOWS = 1;
+ /**
+ * Activity is resizeable.
+ * @hide
+ */
+ public static final int RESIZE_MODE_RESIZEABLE = 2;
+ /**
+ * Activity is resizeable and supported picture-in-picture mode.
+ * @hide
+ */
+ public static final int RESIZE_MODE_RESIZEABLE_AND_PIPABLE = 3;
+ /**
+ * Value indicating if the resizing mode the activity supports.
+ * See {@link android.R.attr#resizeableActivity}.
+ * @hide
+ */
+ public int resizeMode;
+
+ /**
* Bit in {@link #flags} indicating whether this activity is able to
* run in multiple processes. If
* true, the system may instantiate it in the some process as the
@@ -283,20 +312,6 @@
public static final int FLAG_ENABLE_VR_MODE = 0x8000;
/**
- * Bit in {@link #flags} indicating if the activity is resizeable to any dimension.
- * See {@link android.R.attr#resizeableActivity}.
- * @hide
- */
- public static final int FLAG_RESIZEABLE = 0x10000;
-
- /**
- * Bit in {@link #flags} indicating if the activity is supports picture-in-picture form of
- * multi-window mode. See {@link android.R.attr#supportsPictureInPicture}.
- * @hide
- */
- public static final int FLAG_SUPPORTS_PICTURE_IN_PICTURE = 0x20000;
-
- /**
* Bit in {@link #flags} indicating if the activity is always focusable regardless of if it is
* in a task/stack whose activities are normally not focusable.
* See android.R.attr#alwaysFocusable.
@@ -746,6 +761,7 @@
maxRecents = orig.maxRecents;
lockTaskLaunchMode = orig.lockTaskLaunchMode;
layout = orig.layout;
+ resizeMode = orig.resizeMode;
}
/**
@@ -768,6 +784,27 @@
}
}
+ /** @hide */
+ public static boolean isResizeableMode(int mode) {
+ return mode == RESIZE_MODE_RESIZEABLE || mode == RESIZE_MODE_RESIZEABLE_AND_PIPABLE;
+ }
+
+ /** @hide */
+ public static String resizeModeToString(int mode) {
+ switch (mode) {
+ case RESIZE_MODE_UNRESIZEABLE:
+ return "RESIZE_MODE_UNRESIZEABLE";
+ case RESIZE_MODE_CROP_WINDOWS:
+ return "RESIZE_MODE_CROP_WINDOWS";
+ case RESIZE_MODE_RESIZEABLE:
+ return "RESIZE_MODE_RESIZEABLE";
+ case RESIZE_MODE_RESIZEABLE_AND_PIPABLE:
+ return "RESIZE_MODE_RESIZEABLE_AND_PIPABLE";
+ default:
+ return "unknown=" + mode;
+ }
+ }
+
public void dump(Printer pw, String prefix) {
dump(pw, prefix, DUMP_FLAG_ALL);
}
@@ -802,10 +839,11 @@
+ lockTaskLaunchModeToString(lockTaskLaunchMode));
}
if (layout != null) {
- pw.println(prefix + "initialLayout=" + layout.width + "|"
+ pw.println(prefix + "defaultLayout=" + layout.width + "|"
+ layout.widthFraction + ", " + layout.height + "|"
+ layout.heightFraction + ", " + layout.gravity);
}
+ pw.println(prefix + "resizeMode=" + resizeModeToString(resizeMode));
super.dumpBack(pw, prefix, flags);
}
@@ -847,6 +885,7 @@
} else {
dest.writeInt(0);
}
+ dest.writeInt(resizeMode);
}
public static final Parcelable.Creator<ActivityInfo> CREATOR
@@ -879,6 +918,7 @@
if (source.readInt() == 1) {
layout = new Layout(source);
}
+ resizeMode = source.readInt();
}
public static final class Layout {
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index 654396b..1b122307 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -515,6 +515,14 @@
public static final int PRIVATE_FLAG_REQUIRED_FOR_SYSTEM_USER = 1 << 10;
/**
+ * When set, the activities associated with this application are resizeable by default.
+ * @see android.R.styleable#AndroidManifestActivity_resizeableActivity
+ *
+ * @hide
+ */
+ public static final int PRIVATE_FLAG_RESIZEABLE_ACTIVITIES = 1 << 11;
+
+ /**
* Private/hidden flags. See {@code PRIVATE_FLAG_...} constants.
* {@hide}
*/
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 476dc46..3a94bf7 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -2017,6 +2017,11 @@
public static final String FEATURE_SECURELY_REMOVES_USERS
= "android.software.securely_removes_users";
+ /** {@hide} */
+ @SdkConstant(SdkConstantType.FEATURE)
+ public static final String FEATURE_FILE_BASED_ENCRYPTION
+ = "android.software.file_based_encryption";
+
/**
* Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:
* The device has a full implementation of the android.webkit.* APIs. Devices
@@ -3627,7 +3632,7 @@
* {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE}, {@link #MATCH_ENCRYPTION_UNAWARE},
* {@link #MATCH_SYSTEM_ONLY}, {@link #MATCH_UNINSTALLED_PACKAGES}
* to modify the data returned.
- * @param userId The userId of the user being queried.
+ * @param userHandle UserHandle of the user being queried.
*
* @return Returns a List of ResolveInfo objects containing one entry for each
* matching receiver, ordered from best to worst. If there are no matching
@@ -3648,9 +3653,19 @@
*
* @hide
*/
+ @SystemApi
+ public List<ResolveInfo> queryBroadcastReceiversAsUser(Intent intent,
+ @ResolveInfoFlags int flags, UserHandle userHandle) {
+ return queryBroadcastReceiversAsUser(intent, flags, userHandle.getIdentifier());
+ }
+
+ /**
+ * @hide
+ */
public abstract List<ResolveInfo> queryBroadcastReceiversAsUser(Intent intent,
@ResolveInfoFlags int flags, @UserIdInt int userId);
+
/** {@hide} */
@Deprecated
public List<ResolveInfo> queryBroadcastReceivers(Intent intent,
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index a6fec9f..09b85c9 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -16,15 +16,12 @@
package android.content.pm;
-import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_BAD_MANIFEST;
-import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_BAD_PACKAGE_NAME;
-import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_CERTIFICATE_ENCODING;
-import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES;
-import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED;
-import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_NOT_APK;
-import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_NO_CERTIFICATES;
-import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION;
-import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER;
+import com.android.internal.R;
+import com.android.internal.util.ArrayUtils;
+import com.android.internal.util.XmlUtils;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
import android.app.ActivityManager;
import android.content.ComponentName;
@@ -55,15 +52,6 @@
import android.util.jar.StrictJarFile;
import android.view.Gravity;
-import com.android.internal.R;
-import com.android.internal.util.ArrayUtils;
-import com.android.internal.util.XmlUtils;
-
-import libcore.io.IoUtils;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -87,6 +75,26 @@
import java.util.concurrent.atomic.AtomicReference;
import java.util.zip.ZipEntry;
+import libcore.io.IoUtils;
+
+import static android.content.pm.ActivityInfo.FLAG_ALWAYS_FOCUSABLE;
+import static android.content.pm.ActivityInfo.FLAG_IMMERSIVE;
+import static android.content.pm.ActivityInfo.RESIZE_MODE_CROP_WINDOWS;
+import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE;
+import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE_AND_PIPABLE;
+import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
+import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_RESIZEABLE_ACTIVITIES;
+import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_BAD_MANIFEST;
+import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_BAD_PACKAGE_NAME;
+import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_CERTIFICATE_ENCODING;
+import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES;
+import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED;
+import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_NOT_APK;
+import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_NO_CERTIFICATES;
+import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION;
+import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER;
+
/**
* Parser for package files (APKs) on disk. This supports apps packaged either
* as a single "monolithic" APK, or apps packaged as a "cluster" of multiple
@@ -2635,6 +2643,11 @@
ai.privateFlags |= ApplicationInfo.PRIVATE_FLAG_ENCRYPTION_AWARE;
}
+ if (sa.getBoolean(R.styleable.AndroidManifestApplication_resizeableActivity,
+ owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.N)) {
+ ai.privateFlags |= PRIVATE_FLAG_RESIZEABLE_ACTIVITIES;
+ }
+
String str;
str = sa.getNonConfigurationString(
com.android.internal.R.styleable.AndroidManifestApplication_permission, 0);
@@ -3219,24 +3232,32 @@
a.info.flags |= ActivityInfo.FLAG_RESUME_WHILE_PAUSING;
}
- if (sa.getBoolean(R.styleable.AndroidManifestActivity_resizeableActivity,
- owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.N)) {
- a.info.flags |= ActivityInfo.FLAG_RESIZEABLE;
+ a.info.screenOrientation = sa.getInt(
+ R.styleable.AndroidManifestActivity_screenOrientation,
+ SCREEN_ORIENTATION_UNSPECIFIED);
- if (sa.getBoolean(R.styleable.AndroidManifestActivity_supportsPictureInPicture,
- false)) {
- a.info.flags |= ActivityInfo.FLAG_SUPPORTS_PICTURE_IN_PICTURE;
+ a.info.resizeMode = RESIZE_MODE_UNRESIZEABLE;
+ if (owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.N) {
+ final boolean appDefault = (owner.applicationInfo.privateFlags
+ & PRIVATE_FLAG_RESIZEABLE_ACTIVITIES) != 0;
+ if (sa.getBoolean(
+ R.styleable.AndroidManifestActivity_resizeableActivity, appDefault)) {
+ if (sa.getBoolean(R.styleable.AndroidManifestActivity_supportsPictureInPicture,
+ false)) {
+ a.info.resizeMode = RESIZE_MODE_RESIZEABLE_AND_PIPABLE;
+ } else {
+ a.info.resizeMode = RESIZE_MODE_RESIZEABLE;
+ }
}
+ } else if (a.info.screenOrientation == SCREEN_ORIENTATION_UNSPECIFIED
+ && (a.info.flags & FLAG_IMMERSIVE) == 0) {
+ a.info.resizeMode = RESIZE_MODE_CROP_WINDOWS;
}
if (sa.getBoolean(R.styleable.AndroidManifestActivity_alwaysFocusable, false)) {
- a.info.flags |= ActivityInfo.FLAG_ALWAYS_FOCUSABLE;
+ a.info.flags |= FLAG_ALWAYS_FOCUSABLE;
}
- a.info.screenOrientation = sa.getInt(
- R.styleable.AndroidManifestActivity_screenOrientation,
- ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-
a.info.lockTaskLaunchMode =
sa.getInt(R.styleable.AndroidManifestActivity_lockTaskMode, 0);
@@ -3366,25 +3387,25 @@
int height = -1;
float heightFraction = -1f;
final int widthType = sw.getType(
- com.android.internal.R.styleable.AndroidManifestLayout_initialWidth);
+ com.android.internal.R.styleable.AndroidManifestLayout_defaultWidth);
if (widthType == TypedValue.TYPE_FRACTION) {
widthFraction = sw.getFraction(
- com.android.internal.R.styleable.AndroidManifestLayout_initialWidth,
+ com.android.internal.R.styleable.AndroidManifestLayout_defaultWidth,
1, 1, -1);
} else if (widthType == TypedValue.TYPE_DIMENSION) {
width = sw.getDimensionPixelSize(
- com.android.internal.R.styleable.AndroidManifestLayout_initialWidth,
+ com.android.internal.R.styleable.AndroidManifestLayout_defaultWidth,
-1);
}
final int heightType = sw.getType(
- com.android.internal.R.styleable.AndroidManifestLayout_initialHeight);
+ com.android.internal.R.styleable.AndroidManifestLayout_defaultHeight);
if (heightType == TypedValue.TYPE_FRACTION) {
heightFraction = sw.getFraction(
- com.android.internal.R.styleable.AndroidManifestLayout_initialHeight,
+ com.android.internal.R.styleable.AndroidManifestLayout_defaultHeight,
1, 1, -1);
} else if (heightType == TypedValue.TYPE_DIMENSION) {
height = sw.getDimensionPixelSize(
- com.android.internal.R.styleable.AndroidManifestLayout_initialHeight,
+ com.android.internal.R.styleable.AndroidManifestLayout_defaultHeight,
-1);
}
int gravity = sw.getInt(
@@ -3478,6 +3499,8 @@
info.parentActivityName = target.info.parentActivityName;
info.maxRecents = target.info.maxRecents;
info.layout = target.info.layout;
+ info.resizeMode = target.info.resizeMode;
+ info.encryptionAware = target.info.encryptionAware;
Activity a = new Activity(mParseActivityAliasArgs, info);
if (outError[0] != null) {
diff --git a/core/java/android/hardware/input/KeyboardLayout.java b/core/java/android/hardware/input/KeyboardLayout.java
index 584008c..2cafa08 100644
--- a/core/java/android/hardware/input/KeyboardLayout.java
+++ b/core/java/android/hardware/input/KeyboardLayout.java
@@ -16,8 +16,10 @@
package android.hardware.input;
+import android.annotation.NonNull;
import android.os.Parcel;
import android.os.Parcelable;
+import android.util.LocaleList;
import java.util.Locale;
@@ -32,7 +34,8 @@
private final String mLabel;
private final String mCollection;
private final int mPriority;
- private final Locale[] mLocales;
+ @NonNull
+ private final LocaleList mLocales;
private final int mVendorId;
private final int mProductId;
@@ -47,16 +50,12 @@
};
public KeyboardLayout(String descriptor, String label, String collection, int priority,
- Locale[] locales, int vid, int pid) {
+ LocaleList locales, int vid, int pid) {
mDescriptor = descriptor;
mLabel = label;
mCollection = collection;
mPriority = priority;
- if (locales != null) {
- mLocales = locales;
- } else {
- mLocales = new Locale[0];
- }
+ mLocales = locales;
mVendorId = vid;
mProductId = pid;
}
@@ -66,11 +65,7 @@
mLabel = source.readString();
mCollection = source.readString();
mPriority = source.readInt();
- int N = source.readInt();
- mLocales = new Locale[N];
- for (int i = 0; i < N; i++) {
- mLocales[i] = Locale.forLanguageTag(source.readString());
- }
+ mLocales = LocaleList.CREATOR.createFromParcel(source);
mVendorId = source.readInt();
mProductId = source.readInt();
}
@@ -108,7 +103,7 @@
* This may be empty if a locale has not been assigned to this keyboard layout.
* @return The keyboard layout's intended locale.
*/
- public Locale[] getLocales() {
+ public LocaleList getLocales() {
return mLocales;
}
@@ -141,14 +136,7 @@
dest.writeString(mLabel);
dest.writeString(mCollection);
dest.writeInt(mPriority);
- if (mLocales != null) {
- dest.writeInt(mLocales.length);
- for (Locale l : mLocales) {
- dest.writeString(l.toLanguageTag());
- }
- } else {
- dest.writeInt(0);
- }
+ mLocales.writeToParcel(dest, 0);
dest.writeInt(mVendorId);
dest.writeInt(mProductId);
}
diff --git a/core/java/android/hardware/location/ContextHubInfo.aidl b/core/java/android/hardware/location/ContextHubInfo.aidl
new file mode 100644
index 0000000..1a9221a
--- /dev/null
+++ b/core/java/android/hardware/location/ContextHubInfo.aidl
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.location;
+/*
+@hide
+*/
+parcelable ContextHubInfo;
diff --git a/core/java/android/hardware/location/ContextHubInfo.java b/core/java/android/hardware/location/ContextHubInfo.java
new file mode 100644
index 0000000..e47c541
--- /dev/null
+++ b/core/java/android/hardware/location/ContextHubInfo.java
@@ -0,0 +1,351 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.hardware.location;
+
+import android.annotation.SystemApi;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.Arrays;
+
+/**
+ * @hide
+ */
+@SystemApi
+public class ContextHubInfo {
+ private int mId;
+ private String mName;
+ private String mVendor;
+ private String mToolchain;
+ private int mPlatformVersion;
+ private int mStaticSwVersion;
+ private int mToolchainVersion;
+ private float mPeakMips;
+ private float mStoppedPowerDrawMw;
+ private float mSleepPowerDrawMw;
+ private float mPeakPowerDrawMw;
+
+ private int[] mSupportedSensors;
+
+ private MemoryRegion[] mMemoryRegions;
+
+ public ContextHubInfo() {
+ }
+
+ /**
+ * get the context hub unique identifer
+ *
+ * @return int - unique system wide identifier
+ */
+ public int getId() {
+ return mId;
+ }
+
+ /**
+ * set the context hub unique identifer
+ *
+ * @param id - unique system wide identifier for the hub
+ */
+ public void setId(int id) {
+ mId = id;
+ }
+
+ /**
+ * get a string as a hub name
+ *
+ * @return String - a name for the hub
+ */
+ public String getName() {
+ return mName;
+ }
+
+ /**
+ * set a string as the hub name
+ *
+ * @param String - the name for the hub
+ */
+ public void setName(String name) {
+ mName = name;
+ }
+
+ /**
+ * get a string as the vendor name
+ *
+ * @return String - a name for the vendor
+ */
+ public String getVendor() {
+ return mVendor;
+ }
+
+ /**
+ * set a string as the vendor name
+ *
+ * @param String - a name for the vendor
+ */
+ public void setVendor(String vendor) {
+ mVendor = vendor;
+ }
+
+ /**
+ * get tool chain string
+ *
+ * @return String - description of the tool chain
+ */
+ public String getToolchain() {
+ return mToolchain;
+ }
+
+ /**
+ * set tool chain string
+ *
+ * @param String - description of the tool chain
+ */
+ public void setToolchain(String toolchain) {
+ mToolchain = toolchain;
+ }
+
+ /**
+ * get platform version
+ *
+ * @return int - platform version number
+ */
+ public int getPlatformVersion() {
+ return mPlatformVersion;
+ }
+
+ /**
+ * set platform version
+ *
+ * @param platformVersion - platform version number
+ */
+ public void setPlatformVersion(int platformVersion) {
+ mPlatformVersion = platformVersion;
+ }
+
+ /**
+ * get static platform version number
+ *
+ * @return int - platform version number
+ */
+ public int getStaticSwVersion() {
+ return mStaticSwVersion;
+ }
+
+ /**
+ * set platform software version
+ *
+ * @param staticSwVersion - platform static s/w version number
+ */
+ public void setStaticSwVersion(int staticSwVersion) {
+ mStaticSwVersion = staticSwVersion;
+ }
+
+ /**
+ * get the tool chain version
+ *
+ * @return int - the tool chain version
+ */
+ public int getToolchainVersion() {
+ return mToolchainVersion;
+ }
+
+ /**
+ * set the tool chain version number
+ *
+ * @param toolchainVersion - tool chain version number
+ */
+ public void setToolchainVersion(int toolchainVersion) {
+ mToolchainVersion = toolchainVersion;
+ }
+
+ /**
+ * get the peak processing mips the hub can support
+ *
+ * @return float - peak MIPS that this hub can deliver
+ */
+ public float getPeakMips() {
+ return mPeakMips;
+ }
+
+ /**
+ * set the peak mips that this hub can support
+ *
+ * @param peakMips - peak mips this hub can deliver
+ */
+ public void setPeakMips(float peakMips) {
+ mPeakMips = peakMips;
+ }
+
+ /**
+ * get the stopped power draw in milliwatts
+ * This assumes that the hub enter a stopped state - which is
+ * different from the sleep state. Latencies on exiting the
+ * sleep state are typically higher and expect to be in multiple
+ * milliseconds.
+ *
+ * @return float - power draw by the hub in stopped state
+ */
+ public float getStoppedPowerDrawMw() {
+ return mStoppedPowerDrawMw;
+ }
+
+ /**
+ * Set the power consumed by the hub in stopped state
+ *
+ * @param stoppedPowerDrawMw - stopped power in milli watts
+ */
+ public void setStoppedPowerDrawMw(float stoppedPowerDrawMw) {
+ mStoppedPowerDrawMw = stoppedPowerDrawMw;
+ }
+
+ /**
+ * get the power draw of the hub in sleep mode. This assumes
+ * that the hub supports a sleep mode in which the power draw is
+ * lower than the power consumed when the hub is actively
+ * processing. As a guideline, assume that the hub should be
+ * able to enter sleep mode if it knows reliably on completion
+ * of some task that the next interrupt/scheduled work item is
+ * at least 250 milliseconds later.
+ *
+ * @return float - sleep power draw in milli watts
+ */
+ public float getSleepPowerDrawMw() {
+ return mSleepPowerDrawMw;
+ }
+
+ /**
+ * Set the sleep power draw in milliwatts
+ *
+ * @param sleepPowerDrawMw - sleep power draw in milliwatts.
+ */
+ public void setSleepPowerDrawMw(float sleepPowerDrawMw) {
+ mSleepPowerDrawMw = sleepPowerDrawMw;
+ }
+
+ /**
+ * get the peak powe draw of the hub. This is the power consumed
+ * by the hub at maximum load.
+ *
+ * @return float - peak power draw
+ */
+ public float getPeakPowerDrawMw() {
+ return mPeakPowerDrawMw;
+ }
+
+ /**
+ * set the peak power draw of the hub
+ *
+ * @param peakPowerDrawMw - peak power draw of the hub in
+ * milliwatts.
+ */
+ public void setPeakPowerDrawMw(float peakPowerDrawMw) {
+ mPeakPowerDrawMw = peakPowerDrawMw;
+ }
+
+ /**
+ * get the sensors supported by this hub
+ *
+ * @return int[] - all the supported sensors on this hub
+ *
+ * @see ContextHubManager
+ */
+ public int[] getSupportedSensors() {
+ return Arrays.copyOf(mSupportedSensors, mSupportedSensors.length);
+ }
+
+ /**
+ * get the various memory regions on this hub
+ *
+ * @return MemoryRegion[] - all the memory regions on this hub
+ *
+ * @see MemoryRegion
+ */
+ public MemoryRegion[] getMemoryRegions() {
+ return Arrays.copyOf(mMemoryRegions, mMemoryRegions.length);
+ }
+
+ /**
+ * set the supported sensors on this hub
+ *
+ * @param supportedSensors - supported sensors on this hub
+ */
+ public void setSupportedSensors(int[] supportedSensors) {
+ mSupportedSensors = Arrays.copyOf(supportedSensors, supportedSensors.length);
+ }
+
+ /**
+ * set memory regions for this hub
+ *
+ * @param memoryRegions - memory regions information
+ *
+ * @see MemoryRegion
+ */
+ public void setMemoryRegions(MemoryRegion[] memoryRegions) {
+ mMemoryRegions = Arrays.copyOf(memoryRegions, memoryRegions.length);
+ }
+
+ private ContextHubInfo(Parcel in) {
+ mId = in.readInt();
+ mName = in.readString();
+ mVendor = in.readString();
+ mToolchain = in.readString();
+ mPlatformVersion = in.readInt();
+ mToolchainVersion = in.readInt();
+ mStaticSwVersion = in.readInt();
+ mPeakMips = in.readFloat();
+ mStoppedPowerDrawMw = in.readFloat();
+ mSleepPowerDrawMw = in.readFloat();
+ mPeakPowerDrawMw = in.readFloat();
+
+ int numSupportedSensors = in.readInt();
+ mSupportedSensors = new int[numSupportedSensors];
+ in.readIntArray(mSupportedSensors);
+ mMemoryRegions = in.createTypedArray(MemoryRegion.CREATOR);
+ }
+
+ public int describeContents() {
+ return 0;
+ }
+
+ public void writeToParcel(Parcel out, int flags) {
+ out.writeInt(mId);
+ out.writeString(mName);
+ out.writeString(mVendor);
+ out.writeString(mToolchain);
+ out.writeInt(mPlatformVersion);
+ out.writeInt(mToolchainVersion);
+ out.writeInt(mStaticSwVersion);
+ out.writeFloat(mPeakMips);
+ out.writeFloat(mStoppedPowerDrawMw);
+ out.writeFloat(mSleepPowerDrawMw);
+ out.writeFloat(mPeakPowerDrawMw);
+
+ out.writeInt(mSupportedSensors.length);
+ out.writeIntArray(mSupportedSensors);
+ out.writeTypedArray(mMemoryRegions, flags);
+ }
+
+ public static final Parcelable.Creator<ContextHubInfo> CREATOR
+ = new Parcelable.Creator<ContextHubInfo>() {
+ public ContextHubInfo createFromParcel(Parcel in) {
+ return new ContextHubInfo(in);
+ }
+
+ public ContextHubInfo[] newArray(int size) {
+ return new ContextHubInfo[size];
+ }
+ };
+}
diff --git a/core/java/android/hardware/location/ContextHubManager.java b/core/java/android/hardware/location/ContextHubManager.java
new file mode 100644
index 0000000..301b2e4
--- /dev/null
+++ b/core/java/android/hardware/location/ContextHubManager.java
@@ -0,0 +1,278 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.hardware.location;
+
+import android.annotation.SystemApi;
+import android.hardware.location.NanoAppInstanceInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.ServiceConnection;
+import android.Manifest;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+/**
+ * A class that exposes the Context hubs on a device to
+ * applicaions.
+ *
+ * Please not that this class is not expected to be used by
+ * unbundled applications. Also, calling applications are
+ * expected to have LOCTION_HARDWARE premissions to use this
+ * class.
+ *
+ * @hide
+ */
+@SystemApi
+public final class ContextHubManager {
+
+ private static final String TAG = "ContextHubManager";
+ private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+ private static final String HARDWARE_PERMISSION = Manifest.permission.LOCATION_HARDWARE;
+ private static final String ENFORCE_HW_PERMISSION_MESSAGE = "Permission '"
+ + HARDWARE_PERMISSION + "' not granted to access ContextHub Hardware";
+
+ private Context mContext;
+ private IContextHubService mContextHubService;
+ private boolean mContextHubConnected;
+
+ /**
+ * A special context hub identifer meaning any possible hub on
+ * the system.
+ */
+ public static final int ANY_HUB = -1;
+ /**
+ * A constant denoting a message to load a a Nano App
+ */
+ public static final int MSG_LOAD_NANO_APP = 1;
+ /**
+ * A constant denoting a message to unload a a Nano App
+ */
+ public static final int MSG_UNLOAD_NANO_APP = 2;
+ /**
+ * A constant denoting a message to send a message
+ */
+ public static final int MSG_DATA_SEND = 3;
+
+
+ /**
+ * Get a handle to all the context hubs in the system
+ * @return array of context hub handles
+ */
+ public int[] getContexthubHandles() {
+ int[] retVal = null;
+ if(mContextHubConnected) {
+ try {
+ retVal = mContextHubService.getContextHubHandles();
+ }catch (RemoteException e) {
+ Log.e (TAG, "Could not fetch context hub handles :" + e.toString());
+ }
+ }
+ return retVal;
+ }
+
+ /**
+ * Get more information about a specific hub.
+ *
+ * @param contexthubHandle Handle of context hub
+ *
+ * @return ContextHubInfo returned information about the hub
+ *
+ * @see ContextHubInfo
+ */
+ public ContextHubInfo getContexthubInfo(int contexthubHandle) {
+ ContextHubInfo retVal = null;
+ if(mContextHubConnected) {
+ try {
+ retVal = mContextHubService.getContextHubInfo(contexthubHandle);
+ }catch (RemoteException e) {
+ Log.e (TAG, "Could not fetch context hub info :" + e.toString());
+ }
+ }
+
+ return(retVal);
+ }
+
+ /**
+ * Load a nanoapp on a specified context hub
+ *
+ * @param hubHandle handle of context hub to load the app on.
+ * @param app the nanoApp to load on the hub
+ *
+ * @return int nanoAppInstance of the loaded nanoApp on success,
+ * -1 otherwise
+ *
+ * @see NanoApp
+ */
+ public int loadNanoApp(int hubHandle, NanoApp app) {
+ int retVal = -1;
+
+ if(mContextHubConnected) {
+ try {
+ retVal = mContextHubService.loadNanoApp(hubHandle, app);
+ }catch (RemoteException e) {
+ Log.e (TAG, "Could not fetch load nanoApp :" + e.toString());
+ }
+ }
+
+ return retVal;
+ }
+
+ /**
+ * Unload a specified nanoApp
+ *
+ * @param nanoAppInstanceHandle handle of the nanoApp to load
+ *
+ * @return int 0 on success, -1 otherewise
+ */
+ public int unloadNanoApp(int nanoAppInstanceHandle) {
+ int retVal = -1;
+
+ if(mContextHubConnected) {
+ try {
+ retVal = mContextHubService.unloadNanoApp(nanoAppInstanceHandle);
+ }catch (RemoteException e) {
+ Log.e (TAG, "Could not fetch unload nanoApp :" + e.toString());
+ }
+ }
+
+ return retVal;
+ }
+
+ /**
+ * get information about the nano app instance
+ *
+ * @param nanoAppInstanceHandle handle of the nanoAppInstance
+ *
+ * @return NanoAppInstanceInfo Inforamtion about the nano app
+ * instance.
+ *
+ * @see NanoAppInstanceInfo
+ */
+ public NanoAppInstanceInfo getNanoAppInstanceInfo(int nanoAppInstanceHandle) {
+ NanoAppInstanceInfo retVal = null;
+
+ if(mContextHubConnected) {
+ try {
+ retVal = mContextHubService.getNanoAppInstanceInfo(nanoAppInstanceHandle);
+ }catch (RemoteException e) {
+ Log.e (TAG, "Could not fetch nanoApp info :" + e.toString());
+ }
+ }
+
+ return retVal;
+ }
+
+ /**
+ * Find a specified nano app on the system
+ *
+ * @param hubHandle handle of hub to search for nano app
+ * @param filter filter specifying the search criteria for app
+ *
+ * @see NanoAppFilter
+ *
+ * @return Integer[] Array of handles to any found nano apps
+ */
+ public Integer[] findNanoAppOnHub(int hubHandle, NanoAppFilter filter) {
+ int[] temp;
+ Integer[] retVal = null;
+
+ if(mContextHubConnected) {
+ try {
+ temp = mContextHubService.findNanoAppOnHub(hubHandle, filter);
+ retVal = new Integer[temp.length];
+ for (int i = 0; i < temp.length; i++) {
+ retVal[i] = temp[i];
+ }
+ }catch (RemoteException e) {
+ Log.e (TAG, "Could not query nanoApp instance :" + e.toString());
+ }
+ }
+
+ return retVal;
+ }
+
+ /**
+ * Send a message to a spcific nano app instance on a context
+ * hub
+ *
+ *
+ * @param hubHandle handle of the hub to send the message to
+ * @param nanoAppHandle handle of the nano app to send to
+ * @param msg Message to be sent
+ *
+ * @see ContextHubMessage
+ *
+ * @return int 0 on success, -1 otherwise
+ */
+ public int sendMessage(int hubHandle, int nanoAppHandle, ContextHubMessage msg) {
+ int retVal = -1;
+
+ if(mContextHubConnected) {
+ try {
+ retVal = mContextHubService.sendMessage(hubHandle, nanoAppHandle, msg);
+ }catch (RemoteException e) {
+ Log.e (TAG, "Could not fetch send message :" + e.toString());
+ }
+ }
+
+ return retVal;
+ }
+
+ private void checkPermissions() {
+ mContext.enforceCallingPermission(HARDWARE_PERMISSION, ENFORCE_HW_PERMISSION_MESSAGE);
+ }
+
+ private IContextHubCallback.Stub mClientCallback = new IContextHubCallback.Stub() {
+ @Override
+ public void onMessageReceipt(int hubId, int nanoAppId, ContextHubMessage msg) throws RemoteException {
+
+ }
+ };
+
+ private ContextHubManager(Context context) {
+ checkPermissions();
+ mContext = context;
+ mContextHubConnected = false;
+ }
+
+ private ServiceConnection mServiceConnection = new ServiceConnection() {
+ @Override
+ public void onServiceConnected(ComponentName name, IBinder service) {
+ mContextHubService = IContextHubService.Stub.asInterface(service);
+ mContextHubConnected = true;
+
+ // Register our Callback
+ try {
+ mContextHubService.registerCallBack(mClientCallback);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Could not register callback with context hub service :" + e.toString());
+ }
+ Log.d(TAG, "contexthub manager connected to " + name.toString());
+ }
+
+ @Override
+ public void onServiceDisconnected(ComponentName name) {
+ mContextHubService = null;
+ mContextHubConnected = false;
+ Log.d(TAG, "contexthub manager disconnected from " + name.toString());
+ }
+ };
+
+}
diff --git a/core/java/android/hardware/location/ContextHubMessage.aidl b/core/java/android/hardware/location/ContextHubMessage.aidl
new file mode 100644
index 0000000..915f1ec
--- /dev/null
+++ b/core/java/android/hardware/location/ContextHubMessage.aidl
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.location;
+/*
+@hide
+*/
+parcelable ContextHubMessage;
+
diff --git a/core/java/android/hardware/location/ContextHubMessage.java b/core/java/android/hardware/location/ContextHubMessage.java
new file mode 100644
index 0000000..954e97d
--- /dev/null
+++ b/core/java/android/hardware/location/ContextHubMessage.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.location;
+
+
+import android.annotation.SystemApi;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.Arrays;
+
+/**
+ * @hide
+ */
+@SystemApi
+public class ContextHubMessage {
+ private int mType;
+ private int mVersion;
+ private byte[]mData;
+
+ /**
+ * Get the message type
+ *
+ * @return int - message type
+ */
+ public int getMsgType() {
+ return mType;
+ }
+
+ /**
+ * get message version
+ *
+ * @return int - message version
+ */
+ public int getVersion() {
+ return mVersion;
+ }
+
+ /**
+ * get message data
+ *
+ * @return byte[] - message data buffer
+ */
+ public byte[] getData() {
+ return Arrays.copyOf(mData, mData.length);
+ }
+
+ /**
+ * set message type
+ *
+ * @param msgType - message type
+ */
+ public void setMsgType(int msgType) {
+ mType = msgType;
+ }
+
+ /**
+ * Set message version
+ *
+ * @param version - message version
+ */
+ public void setVersion(int version) {
+ mVersion = version;
+ }
+
+ /**
+ * set message data
+ *
+ * @param data - message buffer
+ */
+ public void setMsgData(byte[] data) {
+ mData = Arrays.copyOf(data, data.length);
+ }
+
+ /**
+ * Constructor for a context hub message
+ *
+ * @param msgType - message type
+ * @param version - version
+ * @param data - message buffer
+ */
+ public ContextHubMessage(int msgType, int version, byte[] data) {
+ mType = msgType;
+ mVersion = version;
+ mData = Arrays.copyOf(data, data.length);
+ }
+
+ public int describeContents() {
+ return 0;
+ }
+
+ private ContextHubMessage(Parcel in) {
+ mType = in.readInt();
+ mVersion = in.readInt();
+ byte[] byteBuffer = new byte[in.readInt()];
+ in.readByteArray(byteBuffer);
+ }
+ public void writeToParcel(Parcel out, int flags) {
+ out.writeInt(mType);
+ out.writeInt(mVersion);
+ out.writeInt(mData.length);
+ out.writeByteArray(mData);
+ }
+
+ public static final Parcelable.Creator<ContextHubMessage> CREATOR
+ = new Parcelable.Creator<ContextHubMessage>() {
+ public ContextHubMessage createFromParcel(Parcel in) {
+ return new ContextHubMessage(in);
+ }
+
+ public ContextHubMessage[] newArray(int size) {
+ return new ContextHubMessage[size];
+ }
+ };
+}
diff --git a/core/java/android/hardware/location/ContextHubService.java b/core/java/android/hardware/location/ContextHubService.java
new file mode 100644
index 0000000..a2a13c6
--- /dev/null
+++ b/core/java/android/hardware/location/ContextHubService.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.location;
+
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+/**
+ * @hide
+ */
+public class ContextHubService extends Service {
+
+ private static final String TAG = "ContextHubService";
+ private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+ private static ContextHubService sSingletonInstance;
+ private static final Object sSingletonInstanceLock = new Object();
+
+ private HashMap<Integer, ContextHubInfo> mHubHash;
+ private HashMap<Integer, NanoAppInstanceInfo> mNanoAppHash;
+ private ContextHubInfo[] mContexthubInfo;
+
+
+ private native int nativeSendMessage(int[] header, byte[] data);
+ private native ContextHubInfo[] nativeInitialize();
+
+ private int onMessageReceipt(int[] header, byte[] data) {
+ return 0;
+ }
+ private void initialize() {
+ mContexthubInfo = nativeInitialize();
+
+ mHubHash = new HashMap<Integer, ContextHubInfo>();
+
+ for (int i = 0; i < mContexthubInfo.length; i++) {
+ mHubHash.put(i + 1, mContexthubInfo[i]); // Avoiding zero
+ }
+ }
+
+ private ContextHubService(Context context) {
+ initialize();
+ Log.d(TAG, "Created from " + context.toString());
+ }
+
+ public static ContextHubService getInstance(Context context) {
+ synchronized (sSingletonInstanceLock) {
+ if (sSingletonInstance == null) {
+ sSingletonInstance = new ContextHubService(context);
+ }
+ return sSingletonInstance;
+ }
+ }
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ }
+
+ @Override
+ public IBinder onBind(Intent intent) {
+ return null;
+ }
+
+ private final IContextHubService.Stub mBinder = new IContextHubService.Stub() {
+
+ private IContextHubCallback callback;
+
+ @Override
+ public int registerCallBack(IContextHubCallback callback) throws RemoteException{
+ this.callback = callback;
+ return 0;
+ }
+
+ @Override
+ public int[] getContextHubHandles() throws RemoteException {
+ int [] returnArray = new int[mHubHash.size()];
+ int i = 0;
+ for (int key : mHubHash.keySet()) {
+ // Add any filtering here
+ returnArray[i] = key;
+ i++;
+ }
+ return returnArray;
+ }
+
+ @Override
+ public ContextHubInfo getContextHubInfo(int contexthubHandle) throws RemoteException {
+ return mHubHash.get(contexthubHandle);
+ }
+
+ @Override
+ public int loadNanoApp(int hubHandle, NanoApp app) throws RemoteException {
+ if (!mHubHash.containsKey(hubHandle)) {
+ return -1;
+ } else {
+ // Call Native interface here
+ int[] msgHeader = new int[8];
+ msgHeader[0] = ContextHubManager.MSG_LOAD_NANO_APP;
+ msgHeader[1] = app.getAppId();
+ msgHeader[2] = app.getAppVersion();
+ msgHeader[3] = 0; // LOADING_HINTS
+ msgHeader[4] = hubHandle;
+
+ int handle = nativeSendMessage(msgHeader, app.getAppBinary());
+
+ // if successful, add an entry to mNanoAppHash
+
+ if(handle > 0) {
+ return 0;
+ } else {
+
+ return -1;
+ }
+ }
+ }
+
+ @Override
+ public int unloadNanoApp(int nanoAppInstanceHandle) throws RemoteException {
+ if(!mNanoAppHash.containsKey(nanoAppInstanceHandle)) {
+ return -1;
+ } else {
+ NanoAppInstanceInfo info = mNanoAppHash.get(nanoAppInstanceHandle);
+ // Call Native interface here
+ int[] msgHeader = new int[8];
+ msgHeader[0] = ContextHubManager.MSG_UNLOAD_NANO_APP;
+ msgHeader[1] = info.getContexthubId();
+ msgHeader[2] = info.getHandle();
+
+ int result = nativeSendMessage(msgHeader, null);
+ // if successful, remove the entry in mNanoAppHash
+ if(result == 0) {
+ mNanoAppHash.remove(nanoAppInstanceHandle);
+ }
+ return(result);
+ }
+ }
+
+ @Override
+ public NanoAppInstanceInfo getNanoAppInstanceInfo(int nanoAppInstanceHandle) throws RemoteException {
+ // This assumes that all the nanoAppInfo is current. This is reasonable
+ // for the use cases for tightly controlled nanoApps.
+ //
+ if(!mNanoAppHash.containsKey(nanoAppInstanceHandle)) {
+ return(mNanoAppHash.get(nanoAppInstanceHandle));
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public int[] findNanoAppOnHub(int hubHandle, NanoAppFilter filter) throws RemoteException {
+ ArrayList<Integer> foundInstances = new ArrayList<Integer>();
+
+ for(Integer nanoAppInstance : mNanoAppHash.keySet()) {
+ NanoAppInstanceInfo info = mNanoAppHash.get(nanoAppInstance);
+
+ if(filter.testMatch(info)){
+ foundInstances.add(nanoAppInstance);
+ }
+ }
+
+ int[] retArray = new int[foundInstances.size()];
+ for (int i = 0; i < foundInstances.size(); i++) {
+ retArray[i] = foundInstances.get(i).intValue();
+ }
+
+ return retArray;
+ }
+
+ @Override
+ public int sendMessage(int hubHandle, int nanoAppHandle, ContextHubMessage msg) throws RemoteException {
+ int[] msgHeader = new int[8];
+ msgHeader[0] = ContextHubManager.MSG_DATA_SEND;
+ msgHeader[1] = hubHandle;
+ msgHeader[2] = nanoAppHandle;
+ msgHeader[3] = msg.getMsgType();
+ msgHeader[4] = msg.getVersion();
+
+ return (nativeSendMessage(msgHeader, msg.getData()));
+ }
+ };
+}
diff --git a/core/java/android/hardware/location/IContextHubCallback.aidl b/core/java/android/hardware/location/IContextHubCallback.aidl
new file mode 100644
index 0000000..45b1ef4
--- /dev/null
+++ b/core/java/android/hardware/location/IContextHubCallback.aidl
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.location;
+
+import android.hardware.location.ContextHubMessage;
+
+/** @hide */
+oneway interface IContextHubCallback {
+ void onMessageReceipt(int hubId, int nanoAppId, in ContextHubMessage msg);
+}
diff --git a/core/java/android/hardware/location/IContextHubService.aidl b/core/java/android/hardware/location/IContextHubService.aidl
new file mode 100644
index 0000000..b2db0b2
--- /dev/null
+++ b/core/java/android/hardware/location/IContextHubService.aidl
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.location;
+
+// Declare any non-default types here with import statements
+import android.hardware.location.ContextHubMessage;
+import android.hardware.location.ContextHubInfo;
+import android.hardware.location.NanoApp;
+import android.hardware.location.NanoAppInstanceInfo;
+import android.hardware.location.NanoAppFilter;
+import android.hardware.location.IContextHubCallback;
+
+/** @hide */
+interface IContextHubService {
+
+ // register a callback to receive messages
+ int registerCallBack(in IContextHubCallback callback);
+
+ // Gets a list of available context hub handles
+ int[] getContextHubHandles();
+
+ // Get the properties of a hub
+ ContextHubInfo getContextHubInfo(int contextHubHandle);
+
+ // Load a nanoapp on a specified context hub
+ int loadNanoApp(int hubHandle, in NanoApp app);
+
+ // Unload a nanoapp instance
+ int unloadNanoApp(int nanoAppInstanceHandle);
+
+ // get information about a nanoAppInstance
+ NanoAppInstanceInfo getNanoAppInstanceInfo(int nanoAppInstanceHandle);
+
+ // find all nanoApp instances matching some filter
+ int[] findNanoAppOnHub(int hubHandle, in NanoAppFilter filter);
+
+ // send a message to a nanoApp
+ int sendMessage(int hubHandle, int nanoAppHandle, in ContextHubMessage msg);
+}
diff --git a/core/java/android/hardware/location/MemoryRegion.java b/core/java/android/hardware/location/MemoryRegion.java
new file mode 100644
index 0000000..e8c7615
--- /dev/null
+++ b/core/java/android/hardware/location/MemoryRegion.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.location;
+
+import android.annotation.SystemApi;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * @hide
+ */
+
+@SystemApi
+public class MemoryRegion implements Parcelable{
+
+ private int mSizeBytes;
+ private int mSizeBytesFree;
+ private boolean mIsReadable;
+ private boolean mIsWritable;
+ private boolean mIsExecutable;
+
+ /**
+ * get the capacity of the memory region in bytes
+ *
+ * @return int - the memory capacity in bytes
+ */
+ public int getCapacityBytes() {
+ return mSizeBytes;
+ }
+
+ /**
+ * get the free capacity of the memory region in bytes
+ *
+ * @return int - free bytes
+ */
+ public int getFreeCapacityBytes() {
+ return mSizeBytesFree;
+ }
+
+ /**
+ * Is the memory readable
+ *
+ * @return boolean - true if memory is readable, false otherwise
+ */
+ public boolean isReadable() {
+ return mIsReadable;
+ }
+
+ /**
+ * Is the memory writable
+ *
+ * @return boolean - true if memory is writable, false otherwise
+ */
+ public boolean isWritable() {
+ return mIsWritable;
+ }
+
+ /**
+ * Is the memory executable
+ *
+ * @return boolean - true if memory is executable, false
+ * otherwise
+ */
+ public boolean isExecutable() {
+ return mIsExecutable;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeInt(mSizeBytes);
+ dest.writeInt(mSizeBytesFree);
+ dest.writeInt(mIsReadable ? 1 : 0);
+ dest.writeInt(mIsWritable ? 1 : 0);
+ dest.writeInt(mIsExecutable ? 1 : 0);
+ }
+
+ public MemoryRegion(Parcel source) {
+ mSizeBytes = source.readInt();
+ mSizeBytesFree = source.readInt();
+ mIsReadable = source.readInt() != 0;
+ mIsWritable = source.readInt() != 0;
+ mIsExecutable = source.readInt() != 0;
+ }
+
+ public static final Parcelable.Creator<MemoryRegion> CREATOR
+ = new Parcelable.Creator<MemoryRegion>() {
+ public MemoryRegion createFromParcel(Parcel in) {
+ return new MemoryRegion(in);
+ }
+
+ public MemoryRegion[] newArray(int size) {
+ return new MemoryRegion[size];
+ }
+ };
+
+}
diff --git a/core/java/android/hardware/location/NanoApp.aidl b/core/java/android/hardware/location/NanoApp.aidl
new file mode 100644
index 0000000..d32c44a
--- /dev/null
+++ b/core/java/android/hardware/location/NanoApp.aidl
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.location;
+/*
+@hide
+*/
+parcelable NanoApp;
diff --git a/core/java/android/hardware/location/NanoApp.java b/core/java/android/hardware/location/NanoApp.java
new file mode 100644
index 0000000..36d181f
--- /dev/null
+++ b/core/java/android/hardware/location/NanoApp.java
@@ -0,0 +1,290 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.location;
+
+
+import android.annotation.SystemApi;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * A class describing nano apps.
+ * A nano app is a piece of executable code that can be
+ * downloaded onto a specific architecture. These are targtted
+ * for low power compute domains on a device.
+ *
+ * Nano apps are expected to be used only by bundled apps only
+ * at this time.
+ *
+ * @hide
+ */
+@SystemApi
+public class NanoApp {
+ private String mPublisher;
+ private String mName;
+
+ private int mAppId;
+ private int mAppVersion;
+
+ private int mNeededReadMemBytes;
+ private int mNeededWriteMemBytes;
+ private int mNeededExecMemBytes;
+
+ private int[] mNeededSensors;
+ private int[] mOutputEvents;
+ private byte[] mAppBinary;
+
+ public NanoApp() {
+ }
+
+ /**
+ * Set the publisher name
+ *
+ * @param publisher name of the publisher of this nano app
+ */
+ public void setPublisher(String publisher) {
+ mPublisher = publisher;
+ }
+
+ /**
+ * set the name of the app
+ *
+ * @param name name of the app
+ */
+ public void setName(String name) {
+ mName = name;
+ }
+
+ /**
+ * set the app identifier
+ *
+ * @param appId add identifier
+ */
+ public void setAppId(int appId) {
+ mAppId = appId;
+ }
+
+ /**
+ * Set the app version
+ *
+ * @param appVersion app version
+ */
+ public void setAppVersion(int appVersion) {
+ mAppVersion = appVersion;
+ }
+
+ /**
+ * set memory needed as read only
+ *
+ * @param neededReadMemBytes
+ * read only memory needed in bytes
+ */
+ public void setNeededReadMemBytes(int neededReadMemBytes) {
+ mNeededReadMemBytes = neededReadMemBytes;
+ }
+
+ /**
+ * set writable memory needed in bytes
+ *
+ * @param neededWriteMemBytes
+ * writable memory needed in bytes
+ */
+ public void setNeededWriteMemBytes(int neededWriteMemBytes) {
+ mNeededWriteMemBytes = neededWriteMemBytes;
+ }
+
+ /**
+ * set executable memory needed
+ *
+ * @param neededExecMemBytes
+ * executable memory needed in bytes
+ */
+ public void setNeededExecMemBytes(int neededExecMemBytes) {
+ mNeededExecMemBytes = neededExecMemBytes;
+ }
+
+ /**
+ * set the sensors needed for this app
+ *
+ * @param neededSensors
+ * needed Sensors
+ */
+ public void setNeededSensors(int[] neededSensors) {
+ mNeededSensors = neededSensors;
+ }
+
+ public void setOutputEvents(int[] outputEvents) {
+ mOutputEvents = outputEvents;
+ }
+
+ /**
+ * set output events returned by the nano app
+ *
+ * @param appBinary generated events
+ */
+ public void setAppBinary(byte[] appBinary) {
+ mAppBinary = appBinary;
+ }
+
+
+ /**
+ * get the publisher name
+ *
+ * @return publisher name
+ */
+ public String getPublisher() {
+ return mPublisher;
+ }
+
+ /**
+ * get the name of the app
+ *
+ * @return app name
+ */
+ public String getName() {
+ return mName;
+ }
+
+ /**
+ * get the identifier of the app
+ *
+ * @return identifier for this app
+ */
+ public int getAppId() {
+ return mAppId;
+ }
+
+ /**
+ * get the app version
+ *
+ * @return app version
+ */
+ public int getAppVersion() {
+ return mAppVersion;
+ }
+
+ /**
+ * get the ammount of readable memory needed by this app
+ *
+ * @return readable memory needed in bytes
+ */
+ public int getNeededReadMemBytes() {
+ return mNeededReadMemBytes;
+ }
+
+ /**
+ * get the ammount og writable memory needed in bytes
+ *
+ * @return writable memory needed in bytes
+ */
+ public int getNeededWriteMemBytes() {
+ return mNeededWriteMemBytes;
+ }
+
+ /**
+ * executable memory needed in bytes
+ *
+ * @return executable memory needed in bytes
+ */
+ public int getNeededExecMemBytes() {
+ return mNeededExecMemBytes;
+ }
+
+ /**
+ * get the sensors needed by this app
+ *
+ * @return sensors needed
+ */
+ public int[] getNeededSensors() {
+ return mNeededSensors;
+ }
+
+ /**
+ * get the events generated by this app
+ *
+ * @return generated events
+ */
+ public int[] getOutputEvents() {
+ return mOutputEvents;
+ }
+
+ /**
+ * get the binary for this app
+ *
+ * @return app binary
+ */
+ public byte[] getAppBinary() {
+ return mAppBinary;
+ }
+
+ private NanoApp(Parcel in) {
+ mPublisher = in.readString();
+ mName = in.readString();
+
+ mAppId = in.readInt();
+ mAppVersion = in.readInt();
+ mNeededReadMemBytes = in.readInt();
+ mNeededWriteMemBytes = in.readInt();
+ mNeededExecMemBytes = in.readInt();
+
+ int mNeededSensorsLength = in.readInt();
+ mNeededSensors = new int[mNeededSensorsLength];
+ in.readIntArray(mNeededSensors);
+
+ int mOutputEventsLength = in.readInt();
+ mOutputEvents = new int[mOutputEventsLength];
+ in.readIntArray(mOutputEvents);
+
+ int binaryLength = in.readInt();
+ mAppBinary = new byte[binaryLength];
+ in.readByteArray(mAppBinary);
+ }
+
+ public int describeContents() {
+ return 0;
+ }
+
+ public void writeToParcel(Parcel out, int flags) {
+ out.writeString(mPublisher);
+ out.writeString(mName);
+ out.writeInt(mAppId);
+ out.writeInt(mAppVersion);
+ out.writeInt(mNeededReadMemBytes);
+ out.writeInt(mNeededWriteMemBytes);
+ out.writeInt(mNeededExecMemBytes);
+
+ out.writeInt(mNeededSensors.length);
+ out.writeIntArray(mNeededSensors);
+
+ out.writeInt(mOutputEvents.length);
+ out.writeIntArray(mOutputEvents);
+
+ out.writeInt(mAppBinary.length);
+ out.writeByteArray(mAppBinary);
+ }
+
+ public static final Parcelable.Creator<NanoApp> CREATOR
+ = new Parcelable.Creator<NanoApp>() {
+ public NanoApp createFromParcel(Parcel in) {
+ return new NanoApp(in);
+ }
+
+ public NanoApp[] newArray(int size) {
+ return new NanoApp[size];
+ }
+ };
+}
diff --git a/core/java/android/hardware/location/NanoAppFilter.aidl b/core/java/android/hardware/location/NanoAppFilter.aidl
new file mode 100644
index 0000000..cc6d475
--- /dev/null
+++ b/core/java/android/hardware/location/NanoAppFilter.aidl
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.location;
+/*
+@hide
+*/
+parcelable NanoAppFilter;
diff --git a/core/java/android/hardware/location/NanoAppFilter.java b/core/java/android/hardware/location/NanoAppFilter.java
new file mode 100644
index 0000000..ac341e4
--- /dev/null
+++ b/core/java/android/hardware/location/NanoAppFilter.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.location;
+
+
+import android.annotation.SystemApi;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * @hide
+ */
+@SystemApi
+public class NanoAppFilter {
+
+ // The appId, can be set to APP_ID_ANY
+ private long mAppId;
+
+ // Version to filter apps
+ private int mAppVersion;
+
+ // filtering spec for version
+ private int mVersionRestrictionMask;
+
+ // If APP_ID is any, then a match is performef with the vendor mask
+ private long mAppIdVendorMask;
+
+ // Id of the context hub this instance is expected on
+ private int mContextHubId;
+
+ /**
+ * Flag indicating any version. With this flag set, all versions shall match provided version.
+ */
+ public static final int FLAGS_VERSION_ANY = -1;
+ /**
+ * If this flag is set, only versions strictly greater than the version specified shall match.
+ */
+ public static final int FLAGS_VERSION_GREAT_THAN = 2;
+ /**
+ * If this flag is set, only versions strictly less than the version specified shall match.
+ */
+ public static final int FLAGS_VERSION_LESS_THAN = 4;
+ public static final int FLAGS_VERSION_STRICTLY_EQUAL = 8;
+
+ /**
+ * If this flag is set, only versions strictly equal to the version specified shall match.
+ */
+ public static final int APP_ANY = -1;
+
+ /**
+ * If this flag is set, all vendors shall match.
+ */
+ public static final int VENDOR_ANY = -1;
+
+ /**
+ * If this flag is set, any hub shall match.
+ */
+ public static final int HUB_ANY = -1;
+
+ private NanoAppFilter(Parcel in) {
+ mAppId = in.readLong();
+ mAppVersion = in.readInt();
+ mVersionRestrictionMask = in.readInt();
+ mAppIdVendorMask = in.readInt();
+ }
+
+ public int describeContents() {
+ return 0;
+ }
+
+ public void writeToParcel(Parcel out, int flags) {
+
+ out.writeLong(mAppId);
+ out.writeInt(mAppVersion);
+ out.writeInt(mVersionRestrictionMask);
+ out.writeLong(mAppIdVendorMask);
+ }
+
+ /**
+ * Create a filter
+ *
+ * @param appId application id
+ * @param appVersion application version
+ * @param versionMask version
+ * @param vendorMask vendor
+ */
+ public NanoAppFilter(long appId, int appVersion, int versionMask, long vendorMask) {
+ mAppId = appId;
+ mAppVersion = appVersion;
+ mVersionRestrictionMask = versionMask;
+ mAppIdVendorMask = vendorMask;
+ }
+
+ private boolean versionsMatch(int versionRestrictionMask, int expected, int actual){
+ // some refactoring of version restriction mask is needed, until then, return all
+ return true;
+ }
+ /**
+ *
+ * @param nano app instance info
+ *
+ * @return true if this is a match, false otherwise
+ */
+ public boolean testMatch(NanoAppInstanceInfo info) {
+ if ((mContextHubId == HUB_ANY || info.getContexthubId() == mContextHubId) &&
+ (mAppId == APP_ANY || info.getAppId() == mAppId) &&
+ // (mAppIdVendorMask == VENDOR_ANY) TODO : Expose Vendor mask cleanly
+ (versionsMatch(mVersionRestrictionMask, mAppVersion, info.getAppVersion()))) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public static final Parcelable.Creator<NanoAppFilter> CREATOR
+ = new Parcelable.Creator<NanoAppFilter>() {
+ public NanoAppFilter createFromParcel(Parcel in) {
+ return new NanoAppFilter(in);
+ }
+
+ public NanoAppFilter[] newArray(int size) {
+ return new NanoAppFilter[size];
+ }
+ };
+}
diff --git a/core/java/android/hardware/location/NanoAppInstanceInfo.aidl b/core/java/android/hardware/location/NanoAppInstanceInfo.aidl
new file mode 100644
index 0000000..c8c40d7
--- /dev/null
+++ b/core/java/android/hardware/location/NanoAppInstanceInfo.aidl
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.location;
+/*
+@hide
+*/
+parcelable NanoAppInstanceInfo;
\ No newline at end of file
diff --git a/core/java/android/hardware/location/NanoAppInstanceInfo.java b/core/java/android/hardware/location/NanoAppInstanceInfo.java
new file mode 100644
index 0000000..ac62919
--- /dev/null
+++ b/core/java/android/hardware/location/NanoAppInstanceInfo.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.location;
+
+
+import android.annotation.SystemApi;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * @hide
+ */
+@SystemApi
+public class NanoAppInstanceInfo {
+ private String mPublisher;
+ private String mName;
+
+ private int mAppId;
+ private int mAppVersion;
+
+ private int mNeededReadMemBytes;
+ private int mNeededWriteMemBytes;
+ private int mNeededExecMemBytes;
+
+ private int[] mNeededSensors;
+ private int[] mOutputEvents;
+
+ private int mContexthubId;
+ private int mHandle;
+
+ public NanoAppInstanceInfo() {
+ }
+
+ /**
+ * get the publisher of this app
+ *
+ * @return String - name of the publisher
+ */
+ public String getPublisher() {
+ return mPublisher;
+ }
+
+
+ /**
+ * set the publisher name for the app
+ *
+ * @param publisher - name of the publisher
+ */
+ public void setPublisher(String publisher) {
+ mPublisher = publisher;
+ }
+
+ /**
+ * get the name of the app
+ *
+ * @return String - name of the app
+ */
+ public String getName() {
+ return mName;
+ }
+
+ /**
+ * set the name of the app
+ *
+ * @param name - name of the app
+ */
+ public void setName(String name) {
+ mName = name;
+ }
+
+ /**
+ * Get the application identifier
+ *
+ * @return int - application identifier
+ */
+ public int getAppId() {
+ return mAppId;
+ }
+
+ /**
+ * Set the application identifier
+ *
+ * @param appId - application identifier
+ */
+ public void setAppId(int appId) {
+ mAppId = appId;
+ }
+
+ /**
+ * Set the application version
+ *
+ * @return int - version of the app
+ */
+ public int getAppVersion() {
+ return mAppVersion;
+ }
+
+ /**
+ * Set the application version
+ *
+ * @param appVersion - version of the app
+ */
+ public void setAppVersion(int appVersion) {
+ mAppVersion = appVersion;
+ }
+
+ /**
+ * Get the read memory needed by the app
+ *
+ * @return int - readable memory needed in bytes
+ */
+ public int getNeededReadMemBytes() {
+ return mNeededReadMemBytes;
+ }
+
+ /**
+ * Set the read memory needed by the app
+ *
+ * @param neededReadMemBytes - readable Memory needed in bytes
+ */
+ public void setNeededReadMemBytes(int neededReadMemBytes) {
+ mNeededReadMemBytes = neededReadMemBytes;
+ }
+
+ /**
+ * get writable memory needed by the app
+ *
+ * @return int - writable memory needed by the app
+ */
+ public int getNeededWriteMemBytes() {
+ return mNeededWriteMemBytes;
+ }
+
+ /**
+ * set writable memory needed by the app
+ *
+ * @param neededWriteMemBytes - writable memory needed by the
+ * app
+ */
+ public void setNeededWriteMemBytes(int neededWriteMemBytes) {
+ mNeededWriteMemBytes = neededWriteMemBytes;
+ }
+
+ /**
+ * get executable memory needed by the app
+ *
+ * @return int - executable memory needed by the app
+ */
+ public int getNeededExecMemBytes() {
+ return mNeededExecMemBytes;
+ }
+
+ /**
+ * set executable memory needed by the app
+ *
+ * @param neededExecMemBytes - executable memory needed by the
+ * app
+ */
+ public void setNeededExecMemBytes(int neededExecMemBytes) {
+ mNeededExecMemBytes = neededExecMemBytes;
+ }
+
+ /**
+ * Get the sensors needed by this app
+ *
+ * @return int[] all the required sensors needed by this app
+ */
+ public int[] getNeededSensors() {
+ return mNeededSensors;
+ }
+
+ /**
+ * set the sensors needed by this app
+ *
+ * @param neededSensors - all the sensors needed by this app
+ */
+ public void setNeededSensors(int[] neededSensors) {
+ mNeededSensors = neededSensors;
+ }
+
+ /**
+ * get the events generated by this app
+ *
+ * @return all the events that can be generated by this app
+ */
+ public int[] getOutputEvents() {
+ return mOutputEvents;
+ }
+
+ /**
+ * set the output events that can be generated by this app
+ *
+ * @param outputEvents - the events that may be generated by
+ * this app
+ */
+ public void setOutputEvents(int[] outputEvents) {
+ mOutputEvents = outputEvents;
+ }
+
+ /**
+ * get the context hub identifier
+ *
+ * @return int - system unique hub identifier
+ */
+ public int getContexthubId() {
+ return mContexthubId;
+ }
+
+ /**
+ * set the context hub identifier
+ *
+ * @param contexthubId - system wide unique identifier
+ */
+ public void setContexthubId(int contexthubId) {
+ mContexthubId = contexthubId;
+ }
+
+ /**
+ * get a handle to the nano app instance
+ *
+ * @return int - handle to this instance
+ */
+ public int getHandle() {
+ return mHandle;
+ }
+
+ /**
+ * set the handle for an app instance
+ *
+ * @param handle - handle to this instance
+ */
+ public void setHandle(int handle) {
+ mHandle = handle;
+ }
+
+
+ private NanoAppInstanceInfo(Parcel in) {
+ mPublisher = in.readString();
+ mName = in.readString();
+
+ mAppId = in.readInt();
+ mAppVersion = in.readInt();
+ mNeededReadMemBytes = in.readInt();
+ mNeededWriteMemBytes = in.readInt();
+ mNeededExecMemBytes = in.readInt();
+
+ int mNeededSensorsLength = in.readInt();
+ mNeededSensors = new int[mNeededSensorsLength];
+ in.readIntArray(mNeededSensors);
+
+ int mOutputEventsLength = in.readInt();
+ mOutputEvents = new int[mOutputEventsLength];
+ in.readIntArray(mOutputEvents);
+ }
+
+ public int describeContents() {
+ return 0;
+ }
+
+ public void writeToParcel(Parcel out, int flags) {
+ out.writeString(mPublisher);
+ out.writeString(mName);
+ out.writeInt(mAppId);
+ out.writeInt(mAppVersion);
+ out.writeInt(mContexthubId);
+ out.writeInt(mNeededReadMemBytes);
+ out.writeInt(mNeededWriteMemBytes);
+ out.writeInt(mNeededExecMemBytes);
+
+ out.writeInt(mNeededSensors.length);
+ out.writeIntArray(mNeededSensors);
+
+ out.writeInt(mOutputEvents.length);
+ out.writeIntArray(mOutputEvents);
+
+ }
+
+ public static final Parcelable.Creator<NanoAppInstanceInfo> CREATOR
+ = new Parcelable.Creator<NanoAppInstanceInfo>() {
+ public NanoAppInstanceInfo createFromParcel(Parcel in) {
+ return new NanoAppInstanceInfo(in);
+ }
+
+ public NanoAppInstanceInfo[] newArray(int size) {
+ return new NanoAppInstanceInfo[size];
+ }
+ };
+}
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java
index 3bd12c0..e27c0fb 100644
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -197,6 +197,19 @@
(1 << NET_CAPABILITY_CAPTIVE_PORTAL);
/**
+ * Network specifier for factories which want to match any network specifier
+ * (NS) in a request. Behavior:
+ * <li>Empty NS in request matches any network factory NS</li>
+ * <li>Empty NS in the network factory NS only matches a request with an
+ * empty NS</li>
+ * <li>"*" (this constant) NS in the network factory matches requests with
+ * any NS</li>
+ *
+ * @hide
+ */
+ public static final String MATCH_ALL_REQUESTS_NETWORK_SPECIFIER = "*";
+
+ /**
* Network capabilities that are not allowed in NetworkRequests. This exists because the
* NetworkFactory / NetworkAgent model does not deal well with the situation where a
* capability's presence cannot be known in advance. If such a capability is requested, then we
@@ -596,7 +609,8 @@
}
private boolean satisfiedBySpecifier(NetworkCapabilities nc) {
return (TextUtils.isEmpty(mNetworkSpecifier) ||
- mNetworkSpecifier.equals(nc.mNetworkSpecifier));
+ mNetworkSpecifier.equals(nc.mNetworkSpecifier) ||
+ MATCH_ALL_REQUESTS_NETWORK_SPECIFIER.equals(nc.mNetworkSpecifier));
}
private boolean equalsSpecifier(NetworkCapabilities nc) {
if (TextUtils.isEmpty(mNetworkSpecifier)) {
diff --git a/core/java/android/net/NetworkRequest.java b/core/java/android/net/NetworkRequest.java
index 7da4818..f1edcbe 100644
--- a/core/java/android/net/NetworkRequest.java
+++ b/core/java/android/net/NetworkRequest.java
@@ -188,6 +188,10 @@
* networks.
*/
public Builder setNetworkSpecifier(String networkSpecifier) {
+ if (NetworkCapabilities.MATCH_ALL_REQUESTS_NETWORK_SPECIFIER.equals(networkSpecifier)) {
+ throw new IllegalArgumentException("Invalid network specifier - must not be '"
+ + NetworkCapabilities.MATCH_ALL_REQUESTS_NETWORK_SPECIFIER + "'");
+ }
mNetworkCapabilities.setNetworkSpecifier(networkSpecifier);
return this;
}
diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java
index 4a8dfbc..53b027b 100644
--- a/core/java/android/net/Uri.java
+++ b/core/java/android/net/Uri.java
@@ -2343,7 +2343,7 @@
*/
public void checkFileUriExposed(String location) {
if ("file".equals(getScheme())) {
- StrictMode.onFileUriExposed(location);
+ StrictMode.onFileUriExposed(this, location);
}
}
diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java
index 1af2034..d73deb6 100644
--- a/core/java/android/os/Binder.java
+++ b/core/java/android/os/Binder.java
@@ -468,6 +468,9 @@
/**
* Handle a call to {@link #shellCommand}. The default implementation simply prints
* an error message. Override and replace with your own.
+ * <p class="caution">Note: no permission checking is done before calling this method; you must
+ * apply any security checks as appropriate for the command being executed.
+ * Consider using {@link ShellCommand} to help in the implementation.</p>
* @hide
*/
public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err,
diff --git a/core/java/android/os/FileUriExposedException.java b/core/java/android/os/FileUriExposedException.java
new file mode 100644
index 0000000..e47abe2
--- /dev/null
+++ b/core/java/android/os/FileUriExposedException.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.os;
+
+import android.content.Intent;
+
+/**
+ * The exception that is thrown when an application exposes a {@code file://}
+ * {@link android.net.Uri} to another app.
+ * <p>
+ * This exposure is discouraged since the receiving app may not have access to
+ * the shared path. For example, the receiving app may not have requested the
+ * {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} runtime permission,
+ * or the platform may be sharing the {@link android.net.Uri} across user
+ * profile boundaries.
+ * <p>
+ * Instead, apps should use {@code content://} Uris so the platform can extend
+ * temporary permission for the receiving app to access the resource.
+ * <p>
+ * This is only thrown for applications targeting {@link Build.VERSION_CODES#N}
+ * or higher. Applications targeting earlier SDK versions are allowed to share
+ * {@code file://} {@link android.net.Uri}, but it's strongly discouraged.
+ *
+ * @see android.support.v4.content.FileProvider
+ * @see Intent#FLAG_GRANT_READ_URI_PERMISSION
+ */
+public class FileUriExposedException extends RuntimeException {
+ public FileUriExposedException(String message) {
+ super(message);
+ }
+}
diff --git a/core/java/android/os/FileUtils.java b/core/java/android/os/FileUtils.java
index b73d81e..290f7b3 100644
--- a/core/java/android/os/FileUtils.java
+++ b/core/java/android/os/FileUtils.java
@@ -21,6 +21,7 @@
import android.provider.DocumentsContract.Document;
import android.system.ErrnoException;
import android.system.Os;
+import android.system.StructStat;
import android.text.TextUtils;
import android.util.Log;
import android.util.Slog;
@@ -36,6 +37,7 @@
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileWriter;
+import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
@@ -141,6 +143,16 @@
return 0;
}
+ public static void copyPermissions(File from, File to) throws IOException {
+ try {
+ final StructStat stat = Os.stat(from.getAbsolutePath());
+ Os.chmod(to.getAbsolutePath(), stat.st_mode);
+ Os.chown(to.getAbsolutePath(), stat.st_uid, stat.st_gid);
+ } catch (ErrnoException e) {
+ throw e.rethrowAsIOException();
+ }
+ }
+
/**
* Return owning UID of given path, otherwise -1.
*/
@@ -167,50 +179,57 @@
return false;
}
+ @Deprecated
+ public static boolean copyFile(File srcFile, File destFile) {
+ try {
+ copyFileOrThrow(srcFile, destFile);
+ return true;
+ } catch (IOException e) {
+ return false;
+ }
+ }
+
// copy a file from srcFile to destFile, return true if succeed, return
// false if fail
- public static boolean copyFile(File srcFile, File destFile) {
- boolean result = false;
- try {
- InputStream in = new FileInputStream(srcFile);
- try {
- result = copyToFile(in, destFile);
- } finally {
- in.close();
- }
- } catch (IOException e) {
- result = false;
+ public static void copyFileOrThrow(File srcFile, File destFile) throws IOException {
+ try (InputStream in = new FileInputStream(srcFile)) {
+ copyToFileOrThrow(in, destFile);
}
- return result;
+ }
+
+ @Deprecated
+ public static boolean copyToFile(InputStream inputStream, File destFile) {
+ try {
+ copyToFileOrThrow(inputStream, destFile);
+ return true;
+ } catch (IOException e) {
+ return false;
+ }
}
/**
* Copy data from a source stream to destFile.
* Return true if succeed, return false if failed.
*/
- public static boolean copyToFile(InputStream inputStream, File destFile) {
+ public static void copyToFileOrThrow(InputStream inputStream, File destFile)
+ throws IOException {
+ if (destFile.exists()) {
+ destFile.delete();
+ }
+ FileOutputStream out = new FileOutputStream(destFile);
try {
- if (destFile.exists()) {
- destFile.delete();
+ byte[] buffer = new byte[4096];
+ int bytesRead;
+ while ((bytesRead = inputStream.read(buffer)) >= 0) {
+ out.write(buffer, 0, bytesRead);
}
- FileOutputStream out = new FileOutputStream(destFile);
+ } finally {
+ out.flush();
try {
- byte[] buffer = new byte[4096];
- int bytesRead;
- while ((bytesRead = inputStream.read(buffer)) >= 0) {
- out.write(buffer, 0, bytesRead);
- }
- } finally {
- out.flush();
- try {
- out.getFD().sync();
- } catch (IOException e) {
- }
- out.close();
+ out.getFD().sync();
+ } catch (IOException e) {
}
- return true;
- } catch (IOException e) {
- return false;
+ out.close();
}
}
@@ -648,6 +667,15 @@
}
}
+ public static @NonNull File[] listFilesOrEmpty(File dir, FilenameFilter filter) {
+ File[] res = dir.listFiles(filter);
+ if (res != null) {
+ return res;
+ } else {
+ return EMPTY;
+ }
+ }
+
public static @Nullable File newFileOrNull(@Nullable String path) {
return (path != null) ? new File(path) : null;
}
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
index 1552a3c..1e4ee4b 100644
--- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java
@@ -153,7 +153,7 @@
* Defines the UID/GID for the cameraserver process
* @hide
*/
- public static final int CAMERASERVER_UID = 1046;
+ public static final int CAMERASERVER_UID = 1047;
/**
* Defines the start of a range of UIDs (and GIDs), going from this
diff --git a/core/java/android/os/ShellCommand.java b/core/java/android/os/ShellCommand.java
index 6f12b62..54d1090 100644
--- a/core/java/android/os/ShellCommand.java
+++ b/core/java/android/os/ShellCommand.java
@@ -24,9 +24,11 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
+import java.io.OutputStream;
import java.io.PrintWriter;
/**
+ * Helper for implementing {@link Binder#onShellCommand Binder.onShellCommand}.
* @hide
*/
public abstract class ShellCommand {
@@ -44,6 +46,10 @@
private int mArgPos;
private String mCurArgData;
+ private FileInputStream mFileIn;
+ private FileOutputStream mFileOut;
+ private FileOutputStream mFileErr;
+
private FastPrintWriter mOutPrintWriter;
private FastPrintWriter mErrPrintWriter;
private InputStream mInputStream;
@@ -59,8 +65,12 @@
mCmd = null;
mArgPos = firstArgPos;
mCurArgData = null;
+ mFileIn = null;
+ mFileOut = null;
+ mFileErr = null;
mOutPrintWriter = null;
mErrPrintWriter = null;
+ mInputStream = null;
}
public int exec(Binder target, FileDescriptor in, FileDescriptor out, FileDescriptor err,
@@ -112,28 +122,65 @@
return res;
}
+ /**
+ * Return direct raw access (not buffered) to the command's output data stream.
+ */
+ public OutputStream getRawOutputStream() {
+ if (mFileOut == null) {
+ mFileOut = new FileOutputStream(mOut);
+ }
+ return mFileOut;
+ }
+
+ /**
+ * Return a PrintWriter for formatting output to {@link #getRawOutputStream()}.
+ */
public PrintWriter getOutPrintWriter() {
if (mOutPrintWriter == null) {
- FileOutputStream fout = new FileOutputStream(mOut);
- mOutPrintWriter = new FastPrintWriter(fout);
+ mOutPrintWriter = new FastPrintWriter(getRawOutputStream());
}
return mOutPrintWriter;
}
+ /**
+ * Return direct raw access (not buffered) to the command's error output data stream.
+ */
+ public OutputStream getRawErrorStream() {
+ if (mFileErr == null) {
+ mFileErr = new FileOutputStream(mErr);
+ }
+ return mFileErr;
+ }
+
+ /**
+ * Return a PrintWriter for formatting output to {@link #getRawErrorStream()}.
+ */
public PrintWriter getErrPrintWriter() {
if (mErr == null) {
return getOutPrintWriter();
}
if (mErrPrintWriter == null) {
- FileOutputStream fout = new FileOutputStream(mErr);
- mErrPrintWriter = new FastPrintWriter(fout);
+ mErrPrintWriter = new FastPrintWriter(getRawErrorStream());
}
return mErrPrintWriter;
}
- public InputStream getInputStream() {
+ /**
+ * Return direct raw access (not buffered) to the command's input data stream.
+ */
+ public InputStream getRawInputStream() {
+ if (mFileIn == null) {
+ mFileIn = new FileInputStream(mIn);
+ }
+ return mFileIn;
+ }
+
+ /**
+ * Return buffered access to the command's {@link #getRawInputStream()}.
+ */
+ public InputStream getBufferedInputStream() {
if (mInputStream == null) {
- mInputStream = new BufferedInputStream(new FileInputStream(mIn));
+ mInputStream = new BufferedInputStream(getRawInputStream());
}
return mInputStream;
}
@@ -214,7 +261,28 @@
return -1;
}
+ /**
+ * Implement parsing and execution of a command. If it isn't a command you understand,
+ * call {@link #handleDefaultCommands(String)} and return its result as a last resort.
+ * User {@link #getNextOption()}, {@link #getNextArg()}, and {@link #getNextArgRequired()}
+ * to process additional command line arguments. Command output can be written to
+ * {@link #getOutPrintWriter()} and errors to {@link #getErrPrintWriter()}.
+ *
+ * <p class="caution">Note that no permission checking has been done before entering this function,
+ * so you need to be sure to do your own security verification for any commands you
+ * are executing. The easiest way to do this is to have the ShellCommand contain
+ * only a reference to your service's aidl interface, and do all of your command
+ * implementations on top of that -- that way you can rely entirely on your executing security
+ * code behind that interface.</p>
+ *
+ * @param cmd The first command line argument representing the name of the command to execute.
+ * @return Return the command result; generally 0 or positive indicates success and
+ * negative values indicate error.
+ */
public abstract int onCommand(String cmd);
+ /**
+ * Implement this to print help text about your command to {@link #getOutPrintWriter()}.
+ */
public abstract void onHelp();
}
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java
index f1672df..91d88da 100644
--- a/core/java/android/os/StrictMode.java
+++ b/core/java/android/os/StrictMode.java
@@ -24,6 +24,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
+import android.net.Uri;
import android.util.ArrayMap;
import android.util.Log;
import android.util.Printer;
@@ -46,7 +47,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
/**
@@ -243,42 +243,15 @@
// Byte 3: Penalty
- /**
- * @hide
- */
+ /** {@hide} */
public static final int PENALTY_LOG = 0x01 << 16; // normal android.util.Log
-
- // Used for both process and thread policy:
-
- /**
- * @hide
- */
+ /** {@hide} */
public static final int PENALTY_DIALOG = 0x02 << 16;
-
- /**
- * Death on any detected violation.
- *
- * @hide
- */
+ /** {@hide} */
public static final int PENALTY_DEATH = 0x04 << 16;
-
- /**
- * Death just for detected network usage.
- *
- * @hide
- */
- public static final int PENALTY_DEATH_ON_NETWORK = 0x08 << 16;
-
- /**
- * Flash the screen during violations.
- *
- * @hide
- */
+ /** {@hide} */
public static final int PENALTY_FLASH = 0x10 << 16;
-
- /**
- * @hide
- */
+ /** {@hide} */
public static final int PENALTY_DROPBOX = 0x20 << 16;
/**
@@ -294,12 +267,28 @@
*/
public static final int PENALTY_GATHER = 0x40 << 16;
+ // Byte 4: Special cases
+
+ /**
+ * Death when network traffic is detected on main thread.
+ *
+ * @hide
+ */
+ public static final int PENALTY_DEATH_ON_NETWORK = 0x01 << 24;
+
/**
* Death when cleartext network traffic is detected.
*
* @hide
*/
- public static final int PENALTY_DEATH_ON_CLEARTEXT_NETWORK = 0x80 << 16;
+ public static final int PENALTY_DEATH_ON_CLEARTEXT_NETWORK = 0x02 << 24;
+
+ /**
+ * Death when file exposure is detected.
+ *
+ * @hide
+ */
+ public static final int PENALTY_DEATH_ON_FILE_URI_EXPOSURE = 0x04 << 24;
/**
* Mask of all the penalty bits valid for thread policies.
@@ -312,7 +301,7 @@
* Mask of all the penalty bits valid for VM policies.
*/
private static final int VM_PENALTY_MASK = PENALTY_LOG | PENALTY_DEATH | PENALTY_DROPBOX
- | PENALTY_DEATH_ON_CLEARTEXT_NETWORK;
+ | PENALTY_DEATH_ON_CLEARTEXT_NETWORK | PENALTY_DEATH_ON_FILE_URI_EXPOSURE;
/** {@hide} */
public static final int NETWORK_POLICY_ACCEPT = 0;
@@ -748,10 +737,22 @@
}
/**
- * Detect when a {@code file://} {@link android.net.Uri} is exposed beyond this
- * app. The receiving app may not have access to the sent path.
- * Instead, when sharing files between apps, {@code content://}
- * should be used with permission grants.
+ * Detect when this application exposes a {@code file://}
+ * {@link android.net.Uri} to another app.
+ * <p>
+ * This exposure is discouraged since the receiving app may not have
+ * access to the shared path. For example, the receiving app may not
+ * have requested the
+ * {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} runtime
+ * permission, or the platform may be sharing the
+ * {@link android.net.Uri} across user profile boundaries.
+ * <p>
+ * Instead, apps should use {@code content://} Uris so the platform
+ * can extend temporary permission for the receiving app to access
+ * the resource.
+ *
+ * @see android.support.v4.content.FileProvider
+ * @see Intent#FLAG_GRANT_READ_URI_PERMISSION
*/
public Builder detectFileUriExposure() {
return enable(DETECT_VM_FILE_URI_EXPOSURE);
@@ -798,6 +799,16 @@
}
/**
+ * Crashes the whole process when a {@code file://}
+ * {@link android.net.Uri} is exposed beyond this app.
+ *
+ * @see #detectFileUriExposure()
+ */
+ public Builder penaltyDeathOnFileUriExposure() {
+ return enable(PENALTY_DEATH_ON_FILE_URI_EXPOSURE);
+ }
+
+ /**
* Log detected violations to the system log.
*/
public Builder penaltyLog() {
@@ -1111,6 +1122,25 @@
}
/**
+ * Used by the framework to make file usage a fatal error.
+ *
+ * @hide
+ */
+ public static void enableDeathOnFileUriExposure() {
+ sVmPolicyMask |= DETECT_VM_FILE_URI_EXPOSURE | PENALTY_DEATH_ON_FILE_URI_EXPOSURE;
+ }
+
+ /**
+ * Used by lame internal apps that haven't done the hard work to get
+ * themselves off file:// Uris yet.
+ *
+ * @hide
+ */
+ public static void disableDeathOnFileUriExposure() {
+ sVmPolicyMask &= ~(DETECT_VM_FILE_URI_EXPOSURE | PENALTY_DEATH_ON_FILE_URI_EXPOSURE);
+ }
+
+ /**
* Parses the BlockGuard policy mask out from the Exception's
* getMessage() String value. Kinda gross, but least
* invasive. :/
@@ -1755,9 +1785,13 @@
/**
* @hide
*/
- public static void onFileUriExposed(String location) {
- final String message = "file:// Uri exposed through " + location;
- onVmPolicyViolation(null, new Throwable(message));
+ public static void onFileUriExposed(Uri uri, String location) {
+ final String message = uri + " exposed beyond app through " + location;
+ if ((sVmPolicyMask & PENALTY_DEATH_ON_FILE_URI_EXPOSURE) != 0) {
+ throw new FileUriExposedException(message);
+ } else {
+ onVmPolicyViolation(null, new Throwable(message));
+ }
}
/**
diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java
index bcc1213..344d06e 100644
--- a/core/java/android/os/UserHandle.java
+++ b/core/java/android/os/UserHandle.java
@@ -144,6 +144,7 @@
}
/** @hide */
+ @SystemApi
public static UserHandle of(@UserIdInt int userId) {
return userId == USER_SYSTEM ? SYSTEM : new UserHandle(userId);
}
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 6321122..1ac798b 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -1382,7 +1382,7 @@
/**
* Returns information for all users on this device.
* Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
- * @return the list of users that were created.
+ * @return the list of users that exist on the device.
* @hide
*/
public List<UserInfo> getUsers() {
@@ -1395,6 +1395,29 @@
}
/**
+ * Returns serial numbers of all users on this device.
+ * Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
+ *
+ * @param excludeDying specify if the list should exclude users being removed.
+ * @return the list of serial numbers of users that exist on the device.
+ * @hide
+ */
+ @SystemApi
+ public long[] getSerialNumbersOfUsers(boolean excludeDying) {
+ try {
+ List<UserInfo> users = mService.getUsers(excludeDying);
+ long[] result = new long[users.size()];
+ for (int i = 0; i < result.length; i++) {
+ result[i] = users.get(i).serialNumber;
+ }
+ return result;
+ } catch (RemoteException re) {
+ Log.w(TAG, "Could not get users list", re);
+ return null;
+ }
+ }
+
+ /**
* @return the user's account name, null if not found.
* @hide
*/
diff --git a/core/java/android/preference/PreferenceManager.java b/core/java/android/preference/PreferenceManager.java
index fda6326..ebb12fd 100644
--- a/core/java/android/preference/PreferenceManager.java
+++ b/core/java/android/preference/PreferenceManager.java
@@ -16,6 +16,7 @@
package android.preference;
+import android.annotation.SystemApi;
import android.annotation.XmlRes;
import android.app.Activity;
import android.content.Context;
@@ -24,8 +25,8 @@
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
import android.content.res.XmlResourceParser;
import android.os.Bundle;
import android.util.Log;
@@ -110,7 +111,13 @@
* managed by this instance.
*/
private int mSharedPreferencesMode;
-
+
+ private static final int STORAGE_DEFAULT = 0;
+ private static final int STORAGE_DEVICE_ENCRYPTED = 1;
+ private static final int STORAGE_CREDENTIAL_ENCRYPTED = 2;
+
+ private int mStorage = STORAGE_DEFAULT;
+
/**
* The {@link PreferenceScreen} at the root of the preference hierarchy.
*/
@@ -343,6 +350,46 @@
}
/**
+ * Sets the storage location used internally by this class to be the default
+ * provided by the hosting {@link Context}.
+ */
+ public void setStorageDefault() {
+ mStorage = STORAGE_DEFAULT;
+ mSharedPreferences = null;
+ }
+
+ /**
+ * Explicitly set the storage location used internally by this class to be
+ * device-encrypted storage.
+ * <p>
+ * Data stored in device-encrypted storage is typically encrypted with a key
+ * tied to the physical device, and it can be accessed when the device has
+ * booted successfully, both <em>before and after</em> the user has
+ * authenticated with their credentials (such as a lock pattern or PIN).
+ * Because device-encrypted data is available before user authentication,
+ * you should carefully consider what data you store using this mode.
+ *
+ * @see Context#createDeviceEncryptedStorageContext()
+ */
+ public void setStorageDeviceEncrypted() {
+ mStorage = STORAGE_DEVICE_ENCRYPTED;
+ mSharedPreferences = null;
+ }
+
+ /**
+ * Explicitly set the storage location used internally by this class to be
+ * credential-encrypted storage.
+ *
+ * @see Context#createCredentialEncryptedStorageContext()
+ * @hide
+ */
+ @SystemApi
+ public void setStorageCredentialEncrypted() {
+ mStorage = STORAGE_CREDENTIAL_ENCRYPTED;
+ mSharedPreferences = null;
+ }
+
+ /**
* Gets a SharedPreferences instance that preferences managed by this will
* use.
*
@@ -351,7 +398,20 @@
*/
public SharedPreferences getSharedPreferences() {
if (mSharedPreferences == null) {
- mSharedPreferences = mContext.getSharedPreferences(mSharedPreferencesName,
+ final Context storageContext;
+ switch (mStorage) {
+ case STORAGE_DEVICE_ENCRYPTED:
+ storageContext = mContext.createDeviceEncryptedStorageContext();
+ break;
+ case STORAGE_CREDENTIAL_ENCRYPTED:
+ storageContext = mContext.createCredentialEncryptedStorageContext();
+ break;
+ default:
+ storageContext = mContext;
+ break;
+ }
+
+ mSharedPreferences = storageContext.getSharedPreferences(mSharedPreferencesName,
mSharedPreferencesMode);
}
diff --git a/core/java/android/provider/DocumentsProvider.java b/core/java/android/provider/DocumentsProvider.java
index 7a82cd1e..2250629 100644
--- a/core/java/android/provider/DocumentsProvider.java
+++ b/core/java/android/provider/DocumentsProvider.java
@@ -273,7 +273,6 @@
*
* @param sourceDocumentId the document to copy.
* @param targetParentDocumentId the target document to be copied into as a child.
- * @hide
*/
@SuppressWarnings("unused")
public String copyDocument(String sourceDocumentId, String targetParentDocumentId)
@@ -283,17 +282,19 @@
/**
* Move the requested document or a document tree.
- * <p>
- * Moves a document including all child documents to another location within
+ *
+ * <p>Moves a document including all child documents to another location within
* the same document provider. Upon completion returns the document id of
* the copied document at the target destination. {@code null} must never
* be returned.
*
+ * <p>It's the responsibility of the provider to revoke grants if the document
+ * is no longer accessible using <code>sourceDocumentId</code>.
+ *
* @param sourceDocumentId the document to move.
* @param sourceParentDocumentId the parent of the document to move.
* @param targetParentDocumentId the target document to be a new parent of the
* source document.
- * @hide
*/
@SuppressWarnings("unused")
public String moveDocument(String sourceDocumentId, String sourceParentDocumentId,
@@ -839,9 +840,6 @@
out.putParcelable(DocumentsContract.EXTRA_URI, newDocumentUri);
}
- // Original document no longer exists, clean up any grants.
- revokeDocumentPermission(documentId);
-
} else if (METHOD_REMOVE_DOCUMENT.equals(method)) {
final Uri parentSourceUri = extras.getParcelable(DocumentsContract.EXTRA_PARENT_URI);
final String parentSourceId = DocumentsContract.getDocumentId(parentSourceUri);
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index bc0d7d6..1561d46 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -501,6 +501,23 @@
"android.settings.USER_DICTIONARY_SETTINGS";
/**
+ * Activity Action: Show settings to configure the hardware keyboard layout.
+ * <p>
+ * In some cases, a matching Activity may not exist, so ensure you
+ * safeguard against this.
+ * <p>
+ *
+ * @see android.hardware.input.InputManager#ACTION_QUERY_KEYBOARD_LAYOUTS
+ * <p>
+ * Input: Nothing.
+ * <p>
+ * Output: Nothing.
+ */
+ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_KEYBOARD_LAYOUT_SETTINGS =
+ "android.settings.KEYBOARD_LAYOUT_SETTINGS";
+
+ /**
* Activity Action: Adds a word to the user dictionary.
* <p>
* In some cases, a matching Activity may not exist, so ensure you
@@ -4839,6 +4856,29 @@
"accessibility_display_magnification_auto_update";
/**
+ * Setting that specifies what mode the soft keyboard is in (default or hidden). Can be
+ * modified from an AccessibilityService using the SoftKeyboardController.
+ *
+ * @hide
+ */
+ public static final String ACCESSIBILITY_SOFT_KEYBOARD_MODE =
+ "accessibility_soft_keyboard_mode";
+
+ /**
+ * Default soft keyboard behavior.
+ *
+ * @hide
+ */
+ public static final int SHOW_MODE_AUTO = 0;
+
+ /**
+ * Soft keyboard is never shown.
+ *
+ * @hide
+ */
+ public static final int SHOW_MODE_HIDDEN = 1;
+
+ /**
* Setting that specifies whether timed text (captions) should be
* displayed in video content. Text display properties are controlled by
* the following settings:
@@ -5941,7 +5981,6 @@
CLONE_TO_MANAGED_PROFILE.add(LOCATION_MODE);
CLONE_TO_MANAGED_PROFILE.add(LOCATION_PREVIOUS_MODE);
CLONE_TO_MANAGED_PROFILE.add(LOCATION_PROVIDERS_ALLOWED);
- CLONE_TO_MANAGED_PROFILE.add(LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS);
CLONE_TO_MANAGED_PROFILE.add(SELECTED_INPUT_METHOD_SUBTYPE);
CLONE_TO_MANAGED_PROFILE.add(SELECTED_SPELL_CHECKER);
CLONE_TO_MANAGED_PROFILE.add(SELECTED_SPELL_CHECKER_SUBTYPE);
diff --git a/core/java/android/service/quicksettings/IQSService.aidl b/core/java/android/service/quicksettings/IQSService.aidl
index 4bfc948..1d90505 100644
--- a/core/java/android/service/quicksettings/IQSService.aidl
+++ b/core/java/android/service/quicksettings/IQSService.aidl
@@ -32,4 +32,6 @@
boolean isLocked();
boolean isSecure();
void startUnlockAndRun(in Tile tile);
+
+ void onDialogHidden(in Tile tile);
}
diff --git a/core/java/android/service/quicksettings/TileService.java b/core/java/android/service/quicksettings/TileService.java
index c02465b..0cf1175 100644
--- a/core/java/android/service/quicksettings/TileService.java
+++ b/core/java/android/service/quicksettings/TileService.java
@@ -28,6 +28,8 @@
import android.os.Looper;
import android.os.Message;
import android.os.RemoteException;
+import android.view.View;
+import android.view.View.OnAttachStateChangeListener;
import android.view.WindowManager;
/**
@@ -206,6 +208,20 @@
public final void showDialog(Dialog dialog) {
dialog.getWindow().getAttributes().token = mToken;
dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_QS_DIALOG);
+ dialog.getWindow().getDecorView().addOnAttachStateChangeListener(
+ new OnAttachStateChangeListener() {
+ @Override
+ public void onViewAttachedToWindow(View v) {
+ }
+
+ @Override
+ public void onViewDetachedFromWindow(View v) {
+ try {
+ mService.onDialogHidden(getQsTile());
+ } catch (RemoteException e) {
+ }
+ }
+ });
dialog.show();
try {
mService.onShowDialog(mTile);
diff --git a/core/java/android/service/voice/VoiceInteractionSession.java b/core/java/android/service/voice/VoiceInteractionSession.java
index 0c6a0c6..6ff9fe7 100644
--- a/core/java/android/service/voice/VoiceInteractionSession.java
+++ b/core/java/android/service/voice/VoiceInteractionSession.java
@@ -1170,7 +1170,7 @@
}
try {
intent.migrateExtraStreamToClipData();
- intent.prepareToLeaveProcess();
+ intent.prepareToLeaveProcess(mContext);
int res = mSystemService.startVoiceActivity(mToken, intent,
intent.resolveType(mContext.getContentResolver()));
Instrumentation.checkStartActivityResult(res, intent);
diff --git a/core/java/android/test/AndroidTestCase.java b/core/java/android/test/AndroidTestCase.java
index 2ecbfae..1e6bd9c 100644
--- a/core/java/android/test/AndroidTestCase.java
+++ b/core/java/android/test/AndroidTestCase.java
@@ -29,7 +29,13 @@
/**
* Extend this if you need to access Resources or other things that depend on Activity Context.
+ *
+ * @deprecated Use
+ * <a href="{@docRoot}reference/android/support/test/InstrumentationRegistry.html">
+ * InstrumentationRegistry</a> instead. New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public class AndroidTestCase extends TestCase {
protected Context mContext;
diff --git a/core/java/android/test/FlakyTest.java b/core/java/android/test/FlakyTest.java
index 919767f..4e5c4e3 100644
--- a/core/java/android/test/FlakyTest.java
+++ b/core/java/android/test/FlakyTest.java
@@ -26,7 +26,13 @@
* test methods. When the annotation is present, the test method is re-executed if
* the test fails. The total number of executions is specified by the tolerance and
* defaults to 1.
+ *
+ * @deprecated Use
+ * <a href="{@docRoot}reference/android/support/test/filters/FlakyTest.html">
+ * FlakyTest</a> instead. New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface FlakyTest {
diff --git a/core/java/android/test/InstrumentationTestCase.java b/core/java/android/test/InstrumentationTestCase.java
index ca427ea..6b79314 100644
--- a/core/java/android/test/InstrumentationTestCase.java
+++ b/core/java/android/test/InstrumentationTestCase.java
@@ -32,7 +32,13 @@
/**
* A test case that has access to {@link Instrumentation}.
+ *
+ * @deprecated Use
+ * <a href="{@docRoot}reference/android/support/test/InstrumentationRegistry.html">
+ * InstrumentationRegistry</a> instead. New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public class InstrumentationTestCase extends TestCase {
private Instrumentation mInstrumentation;
@@ -40,7 +46,7 @@
/**
* Injects instrumentation into this test case. This method is
* called by the test runner during test setup.
- *
+ *
* @param instrumentation the instrumentation to use with this instance
*/
public void injectInstrumentation(Instrumentation instrumentation) {
diff --git a/core/java/android/test/InstrumentationTestSuite.java b/core/java/android/test/InstrumentationTestSuite.java
index 7a78ffb..a53fa26 100644
--- a/core/java/android/test/InstrumentationTestSuite.java
+++ b/core/java/android/test/InstrumentationTestSuite.java
@@ -25,7 +25,13 @@
/**
* A {@link junit.framework.TestSuite} that injects {@link android.app.Instrumentation} into
* {@link InstrumentationTestCase} before running them.
+ *
+ * @deprecated Use
+ * <a href="{@docRoot}reference/android/support/test/InstrumentationRegistry.html">
+ * InstrumentationRegistry</a> instead. New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public class InstrumentationTestSuite extends TestSuite {
private final Instrumentation mInstrumentation;
diff --git a/core/java/android/test/PerformanceTestCase.java b/core/java/android/test/PerformanceTestCase.java
index 679ad40..65bd4a4 100644
--- a/core/java/android/test/PerformanceTestCase.java
+++ b/core/java/android/test/PerformanceTestCase.java
@@ -18,10 +18,11 @@
/**
* More complex interface performance for test cases.
- *
+ *
* If you want your test to be used as a performance test, you must
* implement this interface.
*/
+@Deprecated
public interface PerformanceTestCase
{
/**
@@ -37,27 +38,27 @@
}
/**
- * Set up to begin performance tests. The 'intermediates' is a
+ * Set up to begin performance tests. The 'intermediates' is a
* communication channel to send back intermediate performance numbers --
* if you use it, you will probably want to ensure your test is only
* executed once by returning 1. Otherwise, return 0 to allow the test
* harness to decide the number of iterations.
- *
+ *
* <p>If you return a non-zero iteration count, you should call
* {@link Intermediates#startTiming intermediates.startTiming} and
* {@link Intermediates#finishTiming intermediates.endTiming} to report the
* duration of the test whose performance should actually be measured.
- *
+ *
* @param intermediates Callback for sending intermediate results.
- *
+ *
* @return int Maximum number of iterations to run, or 0 to let the caller
- * decide.
+ * decide.
*/
int startPerformance(Intermediates intermediates);
-
+
/**
* This method is used to determine what modes this test case can run in.
- *
+ *
* @return true if this test case can only be run in performance mode.
*/
boolean isPerformanceOnly();
diff --git a/core/java/android/test/UiThreadTest.java b/core/java/android/test/UiThreadTest.java
index cd92231..cd06ab8 100644
--- a/core/java/android/test/UiThreadTest.java
+++ b/core/java/android/test/UiThreadTest.java
@@ -26,7 +26,13 @@
* When the annotation is present, the test method is executed on the application's
* main thread (or UI thread.) Note that instrumentation methods may not be used
* when this annotation is present.
+ *
+ * @deprecated Use
+ * <a href="{@docRoot}reference/android/support/test/annotation/UiThreadTest.html">
+ * UiThreadTest</a> instead. New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface UiThreadTest {
diff --git a/core/java/android/test/suitebuilder/annotation/LargeTest.java b/core/java/android/test/suitebuilder/annotation/LargeTest.java
index a6269e7..dc77ee6 100644
--- a/core/java/android/test/suitebuilder/annotation/LargeTest.java
+++ b/core/java/android/test/suitebuilder/annotation/LargeTest.java
@@ -23,7 +23,13 @@
/**
* Marks a test that should run as part of the large tests.
+ *
+ * @deprecated Use
+ * <a href="{@docRoot}reference/android/support/test/filters/LargeTest.html">
+ * LargeTest</a> instead. New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.TYPE})
public @interface LargeTest {
diff --git a/core/java/android/test/suitebuilder/annotation/MediumTest.java b/core/java/android/test/suitebuilder/annotation/MediumTest.java
index 8afeb91..b941da0 100644
--- a/core/java/android/test/suitebuilder/annotation/MediumTest.java
+++ b/core/java/android/test/suitebuilder/annotation/MediumTest.java
@@ -24,7 +24,12 @@
/**
* Marks a test that should run as part of the medium tests.
*
+ * @deprecated Use
+ * <a href="{@docRoot}reference/android/support/test/filters/MediumTest.html">
+ * MediumTest</a> instead. New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.TYPE})
public @interface MediumTest {
diff --git a/core/java/android/test/suitebuilder/annotation/SmallTest.java b/core/java/android/test/suitebuilder/annotation/SmallTest.java
index ad530e2..d3c74f0 100644
--- a/core/java/android/test/suitebuilder/annotation/SmallTest.java
+++ b/core/java/android/test/suitebuilder/annotation/SmallTest.java
@@ -23,7 +23,13 @@
/**
* Marks a test that should run as part of the small tests.
+ *
+ * @deprecated Use
+ * <a href="{@docRoot}reference/android/support/test/filters/SmallTest.html">
+ * SmallTest</a> instead. New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.TYPE})
public @interface SmallTest {
diff --git a/core/java/android/test/suitebuilder/annotation/Smoke.java b/core/java/android/test/suitebuilder/annotation/Smoke.java
index 237e033..aac2937 100644
--- a/core/java/android/test/suitebuilder/annotation/Smoke.java
+++ b/core/java/android/test/suitebuilder/annotation/Smoke.java
@@ -27,7 +27,11 @@
* will run all tests with this annotation.
*
* @see android.test.suitebuilder.SmokeTestSuiteBuilder
+ *
+ * @deprecated New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.TYPE})
public @interface Smoke {
diff --git a/core/java/android/test/suitebuilder/annotation/Suppress.java b/core/java/android/test/suitebuilder/annotation/Suppress.java
index f16c8fa..629a3cf 100644
--- a/core/java/android/test/suitebuilder/annotation/Suppress.java
+++ b/core/java/android/test/suitebuilder/annotation/Suppress.java
@@ -26,7 +26,12 @@
* suite. If the annotation appears on the class then no tests in that class will be included. If
* the annotation appears only on a test method then only that method will be excluded.
*
+ * @deprecated Use
+ * <a href="{@docRoot}reference/android/support/test/filters/Suppress.html">
+ * Suppress</a> instead. New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.TYPE})
public @interface Suppress {
diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java
index 9a69600..a747f16 100644
--- a/core/java/android/util/DisplayMetrics.java
+++ b/core/java/android/util/DisplayMetrics.java
@@ -131,16 +131,29 @@
public static final float DENSITY_DEFAULT_SCALE = 1.0f / DENSITY_DEFAULT;
/**
- * The device's density.
- * @hide because eventually this should be able to change while
- * running, so shouldn't be a constant.
- * @deprecated There is no longer a static density; you can find the
- * density for a display in {@link #densityDpi}.
+ * The device's current density.
+ * <p>
+ * This value reflects any changes made to the device density. To obtain
+ * the device's stable density, use {@link #DENSITY_DEVICE_STABLE}.
+ *
+ * @hide This value should not be used.
+ * @deprecated Use {@link #DENSITY_DEVICE_STABLE} to obtain the stable
+ * device density or {@link #densityDpi} to obtain the current
+ * density for a specific display.
*/
@Deprecated
public static int DENSITY_DEVICE = getDeviceDensity();
/**
+ * The device's stable density.
+ * <p>
+ * This value is constant at run time and may not reflect the current
+ * display density. To obtain the current density for a specific display,
+ * use {@link #densityDpi}.
+ */
+ public static final int DENSITY_DEVICE_STABLE = getDeviceDensity();
+
+ /**
* The absolute width of the display in pixels.
*/
public int widthPixels;
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl
index b045c17..27ea92d 100644
--- a/core/java/android/view/IWindowManager.aidl
+++ b/core/java/android/view/IWindowManager.aidl
@@ -101,15 +101,16 @@
* @param taskBounds Bounds to use when creating a new Task with the input task Id if
* the task doesn't exist yet.
* @param configuration Configuration that is being used with this task.
- * @param cropWindowsToStack True if the app windows should be cropped to the stack bounds.
+ * @param taskResizeMode The resize mode of the task.
* @param alwaysFocusable True if the app windows are always focusable regardless of the stack
* they are in.
+ * @param homeTask True if this is the task.
*/
void addAppToken(int addPos, IApplicationToken token, int taskId, int stackId,
int requestedOrientation, boolean fullscreen, boolean showWhenLocked, int userId,
int configChanges, boolean voiceInteraction, boolean launchTaskBehind,
- in Rect taskBounds, in Configuration configuration, boolean cropWindowsToStack,
- boolean alwaysFocusable);
+ in Rect taskBounds, in Configuration configuration, int taskResizeMode,
+ boolean alwaysFocusable, boolean homeTask);
/**
*
* @param token The token we are adding to the input task Id.
@@ -119,9 +120,11 @@
* @param taskBounds Bounds to use when creating a new Task with the input task Id if
* the task doesn't exist yet.
* @param config Configuration that is being used with this task.
+ * @param taskResizeMode The resize mode of the task.
+ * @param homeTask True if this is the task.
*/
- void setAppTask(
- IBinder token, int taskId, int stackId, in Rect taskBounds, in Configuration config);
+ void setAppTask(IBinder token, int taskId, int stackId, in Rect taskBounds,
+ in Configuration config, int taskResizeMode, boolean homeTask);
void setAppOrientation(IApplicationToken token, int requestedOrientation);
int getAppOrientation(IApplicationToken token);
void setFocusedApp(IBinder token, boolean moveFocusNow);
diff --git a/core/java/android/view/KeyboardShortcutGroup.java b/core/java/android/view/KeyboardShortcutGroup.java
index 013255b..57d07c0 100644
--- a/core/java/android/view/KeyboardShortcutGroup.java
+++ b/core/java/android/view/KeyboardShortcutGroup.java
@@ -32,6 +32,8 @@
public final class KeyboardShortcutGroup implements Parcelable {
private final CharSequence mLabel;
private final List<KeyboardShortcutInfo> mItems;
+ // The system group looks different UI wise.
+ private boolean mSystemGroup;
/**
* @param label The title to be used for this group, or null if there is none.
@@ -50,10 +52,33 @@
this(label, Collections.<KeyboardShortcutInfo>emptyList());
}
+ /**
+ * @param label The title to be used for this group, or null if there is none.
+ * @param items The set of items to be included.
+ * @param isSystemGroup Set this to {@code true} if this is s system group.
+ * @hide
+ */
+ public KeyboardShortcutGroup(@Nullable CharSequence label,
+ @NonNull List<KeyboardShortcutInfo> items, boolean isSystemGroup) {
+ mLabel = label;
+ mItems = new ArrayList<>(checkNotNull(items));
+ mSystemGroup = isSystemGroup;
+ }
+
+ /**
+ * @param label The title to be used for this group, or null if there is none.
+ * @param isSystemGroup Set this to {@code true} if this is s system group.
+ * @hide
+ */
+ public KeyboardShortcutGroup(@Nullable CharSequence label, boolean isSystemGroup) {
+ this(label, Collections.<KeyboardShortcutInfo>emptyList(), isSystemGroup);
+ }
+
private KeyboardShortcutGroup(Parcel source) {
mItems = new ArrayList<>();
mLabel = source.readCharSequence();
source.readTypedList(mItems, KeyboardShortcutInfo.CREATOR);
+ mSystemGroup = source.readInt() == 1;
}
/**
@@ -70,6 +95,11 @@
return mItems;
}
+ /** @hide **/
+ public boolean isSystemGroup() {
+ return mSystemGroup;
+ }
+
/**
* Adds an item to the existing list.
*
@@ -88,6 +118,7 @@
public void writeToParcel(Parcel dest, int flags) {
dest.writeCharSequence(mLabel);
dest.writeTypedList(mItems);
+ dest.writeInt(mSystemGroup ? 1 : 0);
}
public static final Creator<KeyboardShortcutGroup> CREATOR =
@@ -99,4 +130,4 @@
return new KeyboardShortcutGroup[size];
}
};
-}
\ No newline at end of file
+}
diff --git a/core/java/android/view/NotificationHeaderView.java b/core/java/android/view/NotificationHeaderView.java
index 1c0ea0f..34713ad 100644
--- a/core/java/android/view/NotificationHeaderView.java
+++ b/core/java/android/view/NotificationHeaderView.java
@@ -25,8 +25,6 @@
import android.widget.RemoteViews;
import android.widget.TextView;
-import com.android.internal.R;
-
import java.util.ArrayList;
/**
@@ -39,6 +37,7 @@
public static final int NO_COLOR = -1;
private final int mHeaderMinWidth;
private final int mExpandTopPadding;
+ private final int mContentEndMargin;
private View mAppName;
private View mSubTextView;
private OnClickListener mExpandClickListener;
@@ -51,6 +50,7 @@
private int mOriginalNotificationColor;
private boolean mGroupHeader;
private boolean mExpanded;
+ private boolean mShowWorkBadgeAtEnd;
public NotificationHeaderView(Context context) {
this(context, null);
@@ -68,6 +68,8 @@
super(context, attrs, defStyleAttr, defStyleRes);
mHeaderMinWidth = getResources().getDimensionPixelSize(
com.android.internal.R.dimen.notification_header_shrink_min_width);
+ mContentEndMargin = getResources().getDimensionPixelSize(
+ com.android.internal.R.dimen.notification_content_margin_end);
mExpandTopPadding = (int) (1 * getResources().getDisplayMetrics().density);
}
@@ -135,6 +137,9 @@
super.onLayout(changed, l, t, r, b);
if (mProfileBadge.getVisibility() != View.GONE) {
int paddingEnd = getPaddingEnd();
+ if (mShowWorkBadgeAtEnd) {
+ paddingEnd = mContentEndMargin;
+ }
if (getLayoutDirection() == LAYOUT_DIRECTION_RTL) {
mProfileBadge.layout(paddingEnd,
mProfileBadge.getTop(),
@@ -225,6 +230,17 @@
mExpandButton.setPadding(0, paddingTop, 0, 0);
}
+ public void setShowWorkBadgeAtEnd(boolean showWorkBadgeAtEnd) {
+ if (showWorkBadgeAtEnd != mShowWorkBadgeAtEnd) {
+ setClipToPadding(!showWorkBadgeAtEnd);
+ mShowWorkBadgeAtEnd = showWorkBadgeAtEnd;
+ }
+ }
+
+ public View getWorkProfileIcon() {
+ return mProfileBadge;
+ }
+
public class HeaderTouchListener implements View.OnTouchListener {
private final ArrayList<Rect> mTouchRects = new ArrayList<>();
diff --git a/core/java/android/view/PointerIcon.java b/core/java/android/view/PointerIcon.java
index 7ba046b..81bb638 100644
--- a/core/java/android/view/PointerIcon.java
+++ b/core/java/android/view/PointerIcon.java
@@ -139,9 +139,7 @@
private static final PointerIcon gNullIcon = new PointerIcon(STYLE_NULL);
private static final SparseArray<PointerIcon> gSystemIcons = new SparseArray<PointerIcon>();
-
- /** @hide */
- public static boolean sUseLargeIcons = false;
+ private static boolean sUseLargeIcons = false;
private final int mStyle;
private int mSystemIconResourceId;
@@ -235,6 +233,15 @@
}
/**
+ * Updates wheter accessibility large icons are used or not.
+ * @hide
+ */
+ public static void setUseLargeIcons(boolean use) {
+ sUseLargeIcons = use;
+ gSystemIcons.clear();
+ }
+
+ /**
* Creates a custom pointer from the given bitmap and hotspot information.
*
* @param bitmap The bitmap for the icon.
diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java
index ee70891..96b63d1 100644
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -2154,7 +2154,7 @@
* Called when the activity changes from fullscreen mode to multi-window mode and visa-versa.
* @hide
*/
- public abstract void onMultiWindowModeChanged();
+ public abstract void onMultiWindowChanged();
/**
* Called when the activity just relaunched.
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 772eeec..0c5a5fc 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -589,14 +589,14 @@
public static final int TYPE_VOICE_INTERACTION = FIRST_SYSTEM_WINDOW+31;
/**
- * Window type: Windows that are overlaid <em>only</em> by an {@link
+ * Window type: Windows that are overlaid <em>only</em> by a connected {@link
* android.accessibilityservice.AccessibilityService} for interception of
* user interactions without changing the windows an accessibility service
* can introspect. In particular, an accessibility service can introspect
* only windows that a sighted user can interact with which is they can touch
* these windows or can type into these windows. For example, if there
* is a full screen accessibility overlay that is touchable, the windows
- * below it will be introspectable by an accessibility service regardless
+ * below it will be introspectable by an accessibility service even though
* they are covered by a touchable window.
*/
public static final int TYPE_ACCESSIBILITY_OVERLAY = FIRST_SYSTEM_WINDOW+32;
diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
index 1327ea1..b673386 100644
--- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java
+++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
@@ -38,8 +38,8 @@
/**
* This class represents a node of the window content as well as actions that
* can be requested from its source. From the point of view of an
- * {@link android.accessibilityservice.AccessibilityService} a window content is
- * presented as tree of accessibility node info which may or may not map one-to-one
+ * {@link android.accessibilityservice.AccessibilityService} a window's content is
+ * presented as a tree of accessibility node infos, which may or may not map one-to-one
* to the view hierarchy. In other words, a custom view is free to report itself as
* a tree of accessibility node info.
* </p>
@@ -50,7 +50,7 @@
* <p>
* Please refer to {@link android.accessibilityservice.AccessibilityService} for
* details about how to obtain a handle to window content as a tree of accessibility
- * node info as well as familiarizing with the security model.
+ * node info as well as details about the security model.
* </p>
* <div class="special reference">
* <h3>Developer Guides</h3>
@@ -2422,18 +2422,30 @@
}
/**
- * Gets the text selection start.
+ * Gets the text selection start or the cursor position.
+ * <p>
+ * If no text is selected, both this method and
+ * {@link AccessibilityNodeInfo#getTextSelectionEnd()} return the same value:
+ * the current location of the cursor.
+ * </p>
*
- * @return The text selection start if there is selection or -1.
+ * @return The text selection start, the cursor location if there is no selection, or -1 if
+ * there is no text selection and no cursor.
*/
public int getTextSelectionStart() {
return mTextSelectionStart;
}
/**
- * Gets the text selection end.
+ * Gets the text selection end if text is selected.
+ * <p>
+ * If no text is selected, both this method and
+ * {@link AccessibilityNodeInfo#getTextSelectionStart()} return the same value:
+ * the current location of the cursor.
+ * </p>
*
- * @return The text selection end if there is selection or -1.
+ * @return The text selection end, the cursor location if there is no selection, or -1 if
+ * there is no text selection and no cursor.
*/
public int getTextSelectionEnd() {
return mTextSelectionEnd;
diff --git a/core/java/android/view/accessibility/IAccessibilityManager.aidl b/core/java/android/view/accessibility/IAccessibilityManager.aidl
index 9e79057..655c9b3 100644
--- a/core/java/android/view/accessibility/IAccessibilityManager.aidl
+++ b/core/java/android/view/accessibility/IAccessibilityManager.aidl
@@ -51,7 +51,7 @@
void removeAccessibilityInteractionConnection(IWindow windowToken);
void registerUiTestAutomationService(IBinder owner, IAccessibilityServiceClient client,
- in AccessibilityServiceInfo info);
+ in AccessibilityServiceInfo info, int flags);
void unregisterUiTestAutomationService(IAccessibilityServiceClient client);
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index df84970..7b6fa6d 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -565,6 +565,12 @@
private Runnable mTouchModeReset;
/**
+ * Whether the most recent touch event stream resulted in a successful
+ * long-press action. This is reset on TOUCH_DOWN.
+ */
+ private boolean mHasPerformedLongPress;
+
+ /**
* This view is in transcript mode -- it shows the bottom of the list when the data
* changes
*/
@@ -3108,7 +3114,9 @@
handled = performLongPress(child, longPressPosition, longPressId);
}
}
+
if (handled) {
+ mHasPerformedLongPress = true;
mTouchMode = TOUCH_MODE_REST;
setPressed(false);
child.setPressed(false);
@@ -3811,6 +3819,7 @@
}
private void onTouchDown(MotionEvent ev) {
+ mHasPerformedLongPress = false;
mActivePointerId = ev.getPointerId(0);
if (mTouchMode == TOUCH_MODE_OVERFLING) {
@@ -3874,6 +3883,11 @@
}
private void onTouchMove(MotionEvent ev, MotionEvent vtev) {
+ if (mHasPerformedLongPress) {
+ // Consume all move events following a successful long press.
+ return;
+ }
+
int pointerIndex = ev.findPointerIndex(mActivePointerId);
if (pointerIndex == -1) {
pointerIndex = 0;
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 617d3dd..3a61fcd 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -2872,6 +2872,7 @@
protected PopupWindow mPopupWindow;
protected ViewGroup mContentView;
int mPositionX, mPositionY;
+ int mClippingLimitLeft, mClippingLimitRight;
protected abstract void createPopupWindow();
protected abstract void initContentView();
@@ -2939,8 +2940,9 @@
// Horizontal clipping
final DisplayMetrics displayMetrics = mTextView.getResources().getDisplayMetrics();
final int width = mContentView.getMeasuredWidth();
- positionX = Math.min(displayMetrics.widthPixels - width, positionX);
- positionX = Math.max(0, positionX);
+ positionX = Math.min(
+ displayMetrics.widthPixels - width + mClippingLimitRight, positionX);
+ positionX = Math.max(-mClippingLimitLeft, positionX);
if (isShowing()) {
mPopupWindow.update(positionX, positionY, -1, -1);
@@ -3118,6 +3120,8 @@
private TextView mAddToDictionaryButton;
private TextView mDeleteButton;
private SuggestionSpan mMisspelledSpan;
+ private int mContainerMarginWidth;
+ private int mContainerMarginTop;
private class CustomPopupWindow extends PopupWindow {
@Override
@@ -3155,10 +3159,20 @@
protected void initContentView() {
final LayoutInflater inflater = (LayoutInflater) mTextView.getContext().
getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- final LinearLayout linearLayout = (LinearLayout) inflater.inflate(
+ final ViewGroup relativeLayout = (ViewGroup) inflater.inflate(
mTextView.mTextEditSuggestionContainerLayout, null);
- final ListView suggestionListView = (ListView) linearLayout.findViewById(
+ final LinearLayout suggestionWindowContainer =
+ (LinearLayout) relativeLayout.findViewById(
+ com.android.internal.R.id.suggestionWindowContainer);
+ ViewGroup.MarginLayoutParams lp =
+ (ViewGroup.MarginLayoutParams) suggestionWindowContainer.getLayoutParams();
+ mContainerMarginWidth = lp.leftMargin + lp.rightMargin;
+ mContainerMarginTop = lp.topMargin;
+ mClippingLimitLeft = lp.leftMargin;
+ mClippingLimitRight = lp.rightMargin;
+
+ final ListView suggestionListView = (ListView) relativeLayout.findViewById(
com.android.internal.R.id.suggestionContainer);
mSuggestionsAdapter = new SuggestionAdapter();
@@ -3171,9 +3185,9 @@
mSuggestionInfos[i] = new SuggestionInfo();
}
- mContentView = linearLayout;
+ mContentView = relativeLayout;
- mAddToDictionaryButton = (TextView) linearLayout.findViewById(
+ mAddToDictionaryButton = (TextView) relativeLayout.findViewById(
com.android.internal.R.id.addToDictionaryButton);
mAddToDictionaryButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
@@ -3197,7 +3211,7 @@
}
});
- mDeleteButton = (TextView) linearLayout.findViewById(
+ mDeleteButton = (TextView) relativeLayout.findViewById(
com.android.internal.R.id.deleteButton);
mDeleteButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
@@ -3306,6 +3320,8 @@
mDeleteButton.measure(horizontalMeasure, verticalMeasure);
width = Math.max(width, mDeleteButton.getMeasuredWidth());
+ width += mContainerMarginWidth;
+
// Enforce the width based on actual text widths
mContentView.measure(
View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
@@ -3327,7 +3343,7 @@
@Override
protected int getVerticalLocalPosition(int line) {
- return mTextView.getLayout().getLineBottom(line);
+ return mTextView.getLayout().getLineBottom(line) - mContainerMarginTop;
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/chooser/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
similarity index 95%
rename from packages/SystemUI/src/com/android/systemui/chooser/ChooserActivity.java
rename to core/java/com/android/internal/app/ChooserActivity.java
index a8bc36e..2733391 100644
--- a/packages/SystemUI/src/com/android/systemui/chooser/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.systemui.chooser;
+package com.android.internal.app;
import android.animation.ObjectAnimator;
import android.annotation.NonNull;
@@ -25,7 +25,6 @@
import android.content.IntentSender;
import android.content.IntentSender.SendIntentException;
import android.content.ServiceConnection;
-import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.content.pm.LabeledIntent;
import android.content.pm.PackageManager;
@@ -36,7 +35,6 @@
import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
import android.os.Bundle;
-import android.os.Environment;
import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
@@ -67,12 +65,9 @@
import android.widget.BaseAdapter;
import android.widget.ListView;
import com.android.internal.R;
-import com.android.internal.app.IntentForwarderActivity;
-import com.android.internal.app.ResolverActivity;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
-import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -96,11 +91,6 @@
private ChooserListAdapter mChooserListAdapter;
private ChooserRowAdapter mChooserRowAdapter;
- private SharedPreferences mPinnedSharedPrefs;
- private static final float PINNED_TARGET_SCORE_BOOST = 1000.f;
- private static final String PINNED_SHARED_PREFS_NAME = "chooser_pin_settings";
- private static final String TARGET_DETAILS_FRAGMENT_TAG = "targetDetailsFragment";
-
private final List<ChooserTargetServiceConnection> mServiceConnections = new ArrayList<>();
private static final int CHOOSER_TARGET_SERVICE_RESULT = 1;
@@ -217,18 +207,12 @@
mRefinementIntentSender = intent.getParcelableExtra(
Intent.EXTRA_CHOOSER_REFINEMENT_INTENT_SENDER);
setSafeForwardingMode(true);
-
- mPinnedSharedPrefs = getPinnedSharedPrefs(this);
super.onCreate(savedInstanceState, target, title, defaultTitleRes, initialIntents,
null, false);
MetricsLogger.action(this, MetricsEvent.ACTION_ACTIVITY_CHOOSER_SHOWN);
}
- static SharedPreferences getPinnedSharedPrefs(Context context) {
- return context.getSharedPreferences(PINNED_SHARED_PREFS_NAME, MODE_PRIVATE);
- }
-
@Override
protected void onDestroy() {
super.onDestroy();
@@ -259,7 +243,7 @@
}
@Override
- public void onActivityStarted(TargetInfo cti) {
+ void onActivityStarted(TargetInfo cti) {
if (mChosenComponentSender != null) {
final ComponentName target = cti.getResolvedComponentName();
if (target != null) {
@@ -275,7 +259,7 @@
}
@Override
- public void onPrepareAdapterView(AbsListView adapterView, ResolveListAdapter adapter,
+ void onPrepareAdapterView(AbsListView adapterView, ResolveListAdapter adapter,
boolean alwaysUseOption) {
final ListView listView = adapterView instanceof ListView ? (ListView) adapterView : null;
mChooserListAdapter = (ChooserListAdapter) adapter;
@@ -288,17 +272,17 @@
}
@Override
- public int getLayoutResource() {
+ int getLayoutResource() {
return R.layout.chooser_grid;
}
@Override
- public boolean shouldGetActivityMetadata() {
+ boolean shouldGetActivityMetadata() {
return true;
}
@Override
- public boolean shouldAutoLaunchSingleChoice(TargetInfo target) {
+ boolean shouldAutoLaunchSingleChoice(TargetInfo target) {
final Intent intent = target.getResolvedIntent();
final ResolveInfo resolve = target.getResolveInfo();
@@ -315,16 +299,6 @@
return false;
}
- @Override
- public void showTargetDetails(ResolveInfo ri) {
- ComponentName name = ri.activityInfo.getComponentName();
- boolean pinned = mPinnedSharedPrefs.getBoolean(name.flattenToString(), false);
- ResolverTargetActionsDialogFragment f =
- new ResolverTargetActionsDialogFragment(ri.loadLabel(getPackageManager()),
- name, pinned);
- f.show(getFragmentManager(), TARGET_DETAILS_FRAGMENT_TAG);
- }
-
private void modifyTargetIntent(Intent in) {
final String action = in.getAction();
if (Intent.ACTION_SEND.equals(action) ||
@@ -366,7 +340,7 @@
}
@Override
- public void startSelected(int which, boolean always, boolean filtered) {
+ void startSelected(int which, boolean always, boolean filtered) {
super.startSelected(which, always, filtered);
if (mChooserListAdapter != null) {
@@ -497,7 +471,7 @@
mChooserHandler.removeMessages(CHOOSER_TARGET_SERVICE_WATCHDOG_TIMEOUT);
}
- public void onSetupVoiceInteraction() {
+ void onSetupVoiceInteraction() {
// Do nothing. We'll send the voice stuff ourselves.
}
@@ -569,7 +543,7 @@
}
@Override
- public ResolveListAdapter createAdapter(Context context, List<Intent> payloadIntents,
+ ResolveListAdapter createAdapter(Context context, List<Intent> payloadIntents,
Intent[] initialIntents, List<ResolveInfo> rList, int launchedFromUid,
boolean filterLastUsed) {
final ChooserListAdapter adapter = new ChooserListAdapter(context, payloadIntents,
@@ -737,11 +711,6 @@
}
return results;
}
-
- @Override
- public boolean isPinned() {
- return mSourceInfo != null ? mSourceInfo.isPinned() : false;
- }
}
public class ChooserListAdapter extends ResolveListAdapter {
@@ -808,20 +777,6 @@
}
@Override
- public boolean isComponentPinned(ComponentName name) {
- return mPinnedSharedPrefs.getBoolean(name.flattenToString(), false);
- }
-
- @Override
- public float getScore(DisplayResolveInfo target) {
- float score = super.getScore(target);
- if (target.isPinned()) {
- score += PINNED_TARGET_SCORE_BOOST;
- }
- return score;
- }
-
- @Override
public View onCreateView(ViewGroup parent) {
return mInflater.inflate(
com.android.internal.R.layout.resolve_grid_item, parent, false);
@@ -1166,7 +1121,7 @@
v.setOnLongClickListener(new OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
- showTargetDetails(
+ showAppDetails(
mChooserListAdapter.resolveInfoForPosition(
holder.itemIndices[column], true));
return true;
diff --git a/core/java/com/android/internal/app/IntentForwarderActivity.java b/core/java/com/android/internal/app/IntentForwarderActivity.java
index 1244987..dbec740 100644
--- a/core/java/com/android/internal/app/IntentForwarderActivity.java
+++ b/core/java/com/android/internal/app/IntentForwarderActivity.java
@@ -100,7 +100,7 @@
final boolean shouldShowDisclosure = ri == null || ri.activityInfo == null ||
!"android".equals(ri.activityInfo.packageName) ||
!(ResolverActivity.class.getName().equals(ri.activityInfo.name)
- || "com.android.systemui.chooser.ChooserActivity".equals(ri.activityInfo.name));
+ || ChooserActivity.class.getName().equals(ri.activityInfo.name));
try {
startActivityAsCaller(newIntent, null, false, targetUserId);
diff --git a/core/java/com/android/internal/app/LocaleHelper.java b/core/java/com/android/internal/app/LocaleHelper.java
index 71c2c21..c7459d7 100644
--- a/core/java/com/android/internal/app/LocaleHelper.java
+++ b/core/java/com/android/internal/app/LocaleHelper.java
@@ -17,6 +17,7 @@
package com.android.internal.app;
import android.icu.util.ULocale;
+import android.icu.text.ListFormatter;
import android.util.LocaleList;
import java.text.Collator;
@@ -145,20 +146,16 @@
* @return the locale aware list of locale names
*/
public static String getDisplayLocaleList(LocaleList locales, Locale displayLocale) {
- final StringBuilder result = new StringBuilder();
-
final Locale dispLocale = displayLocale == null ? Locale.getDefault() : displayLocale;
+
int localeCount = locales.size();
+ final String[] localeNames = new String[localeCount];
for (int i = 0; i < localeCount; i++) {
- Locale locale = locales.get(i);
- result.append(LocaleHelper.getDisplayName(locale, dispLocale, false));
- // TODO: language aware list formatter. ICU has one.
- if (i < localeCount - 1) {
- result.append(", ");
- }
+ localeNames[i] = LocaleHelper.getDisplayName(locales.get(i), dispLocale, false);
}
- return result.toString();
+ ListFormatter lfn = ListFormatter.getInstance(dispLocale);
+ return lfn.format(localeNames);
}
/**
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 7eb8708..ec148c55 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -22,7 +22,6 @@
import android.app.VoiceInteractor.PickOptionRequest;
import android.app.VoiceInteractor.PickOptionRequest.Option;
import android.app.VoiceInteractor.Prompt;
-import android.content.pm.ComponentInfo;
import android.os.AsyncTask;
import android.provider.Settings;
import android.text.TextUtils;
@@ -337,12 +336,12 @@
/**
* Perform any initialization needed for voice interaction.
*/
- public void onSetupVoiceInteraction() {
+ void onSetupVoiceInteraction() {
// Do it right now. Subclasses may delay this and send it later.
sendVoiceChoicesIfNeeded();
}
- public void sendVoiceChoicesIfNeeded() {
+ void sendVoiceChoicesIfNeeded() {
if (!isVoiceInteraction()) {
// Clearly not needed.
return;
@@ -383,7 +382,7 @@
return null;
}
- public int getLayoutResource() {
+ int getLayoutResource() {
return R.layout.resolver_list;
}
@@ -592,7 +591,7 @@
mAlwaysUseOption);
}
- public void startSelected(int which, boolean always, boolean filtered) {
+ void startSelected(int which, boolean always, boolean filtered) {
if (isFinishing()) {
return;
}
@@ -762,7 +761,7 @@
return true;
}
- public void safelyStartActivity(TargetInfo cti) {
+ void safelyStartActivity(TargetInfo cti) {
// If needed, show that intent is forwarded
// from managed profile to owner or other way around.
if (mProfileSwitchMessageId != -1) {
@@ -792,26 +791,26 @@
}
}
- public void onActivityStarted(TargetInfo cti) {
+ void onActivityStarted(TargetInfo cti) {
// Do nothing
}
- public boolean shouldGetActivityMetadata() {
+ boolean shouldGetActivityMetadata() {
return false;
}
- public boolean shouldAutoLaunchSingleChoice(TargetInfo target) {
+ boolean shouldAutoLaunchSingleChoice(TargetInfo target) {
return true;
}
- public void showTargetDetails(ResolveInfo ri) {
+ void showAppDetails(ResolveInfo ri) {
Intent in = new Intent().setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
.setData(Uri.fromParts("package", ri.activityInfo.packageName, null))
.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
startActivity(in);
}
- public ResolveListAdapter createAdapter(Context context, List<Intent> payloadIntents,
+ ResolveListAdapter createAdapter(Context context, List<Intent> payloadIntents,
Intent[] initialIntents, List<ResolveInfo> rList, int launchedFromUid,
boolean filterLastUsed) {
return new ResolveListAdapter(context, payloadIntents, initialIntents, rList,
@@ -821,7 +820,7 @@
/**
* Returns true if the activity is finishing and creation should halt
*/
- public boolean configureContentView(List<Intent> payloadIntents, Intent[] initialIntents,
+ boolean configureContentView(List<Intent> payloadIntents, Intent[] initialIntents,
List<ResolveInfo> rList, boolean alwaysUseOption) {
// The last argument of createAdapter is whether to do special handling
// of the last used choice to highlight it in the list. We need to always
@@ -868,7 +867,7 @@
return false;
}
- public void onPrepareAdapterView(AbsListView adapterView, ResolveListAdapter adapter,
+ void onPrepareAdapterView(AbsListView adapterView, ResolveListAdapter adapter,
boolean alwaysUseOption) {
final boolean useHeader = adapter.hasFilteredItem();
final ListView listView = adapterView instanceof ListView ? (ListView) adapterView : null;
@@ -899,7 +898,7 @@
&& Objects.equals(lhs.activityInfo.packageName, rhs.activityInfo.packageName);
}
- public final class DisplayResolveInfo implements TargetInfo {
+ final class DisplayResolveInfo implements TargetInfo {
private final ResolveInfo mResolveInfo;
private final CharSequence mDisplayLabel;
private Drawable mDisplayIcon;
@@ -907,9 +906,8 @@
private final CharSequence mExtendedInfo;
private final Intent mResolvedIntent;
private final List<Intent> mSourceIntents = new ArrayList<>();
- private boolean mPinned;
- public DisplayResolveInfo(Intent originalIntent, ResolveInfo pri, CharSequence pLabel,
+ DisplayResolveInfo(Intent originalIntent, ResolveInfo pri, CharSequence pLabel,
CharSequence pInfo, Intent pOrigIntent) {
mSourceIntents.add(originalIntent);
mResolveInfo = pri;
@@ -934,7 +932,6 @@
mExtendedInfo = other.mExtendedInfo;
mResolvedIntent = new Intent(other.mResolvedIntent);
mResolvedIntent.fillIn(fillInIntent, flags);
- mPinned = other.mPinned;
}
public ResolveInfo getResolveInfo() {
@@ -1029,15 +1026,6 @@
activity.startActivityAsUser(mResolvedIntent, options, user);
return false;
}
-
- @Override
- public boolean isPinned() {
- return mPinned;
- }
-
- public void setPinned(boolean pinned) {
- mPinned = pinned;
- }
}
/**
@@ -1051,7 +1039,7 @@
*
* @return the resolved intent for this target
*/
- Intent getResolvedIntent();
+ public Intent getResolvedIntent();
/**
* Get the resolved component name that represents this target. Note that this may not
@@ -1060,7 +1048,7 @@
*
* @return the resolved ComponentName for this target
*/
- ComponentName getResolvedComponentName();
+ public ComponentName getResolvedComponentName();
/**
* Start the activity referenced by this target.
@@ -1069,7 +1057,7 @@
* @param options ActivityOptions bundle
* @return true if the start completed successfully
*/
- boolean start(Activity activity, Bundle options);
+ public boolean start(Activity activity, Bundle options);
/**
* Start the activity referenced by this target as if the ResolverActivity's caller
@@ -1080,7 +1068,7 @@
* @param userId userId to start as or {@link UserHandle#USER_NULL} for activity's caller
* @return true if the start completed successfully
*/
- boolean startAsCaller(Activity activity, Bundle options, int userId);
+ public boolean startAsCaller(Activity activity, Bundle options, int userId);
/**
* Start the activity referenced by this target as a given user.
@@ -1090,7 +1078,7 @@
* @param user handle for the user to start the activity as
* @return true if the start completed successfully
*/
- boolean startAsUser(Activity activity, Bundle options, UserHandle user);
+ public boolean startAsUser(Activity activity, Bundle options, UserHandle user);
/**
* Return the ResolveInfo about how and why this target matched the original query
@@ -1098,14 +1086,14 @@
*
* @return ResolveInfo representing this target's match
*/
- ResolveInfo getResolveInfo();
+ public ResolveInfo getResolveInfo();
/**
* Return the human-readable text label for this target.
*
* @return user-visible target label
*/
- CharSequence getDisplayLabel();
+ public CharSequence getDisplayLabel();
/**
* Return any extended info for this target. This may be used to disambiguate
@@ -1113,40 +1101,35 @@
*
* @return human-readable disambig string or null if none present
*/
- CharSequence getExtendedInfo();
+ public CharSequence getExtendedInfo();
/**
* @return The drawable that should be used to represent this target
*/
- Drawable getDisplayIcon();
+ public Drawable getDisplayIcon();
/**
* @return The (small) icon to badge the target with
*/
- Drawable getBadgeIcon();
+ public Drawable getBadgeIcon();
/**
* @return The content description for the badge icon
*/
- CharSequence getBadgeContentDescription();
+ public CharSequence getBadgeContentDescription();
/**
* Clone this target with the given fill-in information.
*/
- TargetInfo cloneFilledIn(Intent fillInIntent, int flags);
+ public TargetInfo cloneFilledIn(Intent fillInIntent, int flags);
/**
* @return the list of supported source intents deduped against this single target
*/
- List<Intent> getAllSourceIntents();
-
- /**
- * @return true if this target should be pinned to the front by the request of the user
- */
- boolean isPinned();
+ public List<Intent> getAllSourceIntents();
}
- public class ResolveListAdapter extends BaseAdapter {
+ class ResolveListAdapter extends BaseAdapter {
private final List<Intent> mIntents;
private final Intent[] mInitialIntents;
private final List<ResolveInfo> mBaseResolveList;
@@ -1393,12 +1376,9 @@
}
}
if (!found) {
- final ComponentName name = new ComponentName(
- newInfo.activityInfo.packageName, newInfo.activityInfo.name);
- final ResolvedComponentInfo rci = new ResolvedComponentInfo(name,
- intent, newInfo);
- rci.setPinned(isComponentPinned(name));
- into.add(rci);
+ into.add(new ResolvedComponentInfo(new ComponentName(
+ newInfo.activityInfo.packageName, newInfo.activityInfo.name),
+ intent, newInfo));
}
}
}
@@ -1474,8 +1454,6 @@
final Intent replaceIntent = getReplacementIntent(add.activityInfo, intent);
final DisplayResolveInfo dri = new DisplayResolveInfo(intent, add, roLabel,
extraInfo, replaceIntent);
- final ComponentInfo ci = add.getComponentInfo();
- dri.setPinned(rci.isPinned());
addResolveInfo(dri);
if (replaceIntent == intent) {
// Only add alternates if we didn't get a specific replacement from
@@ -1559,11 +1537,11 @@
return false;
}
- public int getDisplayResolveInfoCount() {
+ protected int getDisplayResolveInfoCount() {
return mDisplayList.size();
}
- public DisplayResolveInfo getDisplayResolveInfo(int index) {
+ protected DisplayResolveInfo getDisplayResolveInfo(int index) {
// Used to query services. We only query services for primary targets, not alternates.
return mDisplayList.get(index);
}
@@ -1593,10 +1571,6 @@
return !TextUtils.isEmpty(info.getExtendedInfo());
}
- public boolean isComponentPinned(ComponentName name) {
- return false;
- }
-
public final void bindView(int position, View view) {
onBindView(view, getItem(position));
}
@@ -1633,7 +1607,6 @@
static final class ResolvedComponentInfo {
public final ComponentName name;
- private boolean mPinned;
private final List<Intent> mIntents = new ArrayList<>();
private final List<ResolveInfo> mResolveInfos = new ArrayList<>();
@@ -1676,14 +1649,6 @@
}
return -1;
}
-
- public boolean isPinned() {
- return mPinned;
- }
-
- public void setPinned(boolean pinned) {
- mPinned = pinned;
- }
}
static class ViewHolder {
@@ -1737,7 +1702,7 @@
return false;
}
ResolveInfo ri = mAdapter.resolveInfoForPosition(position, true);
- showTargetDetails(ri);
+ showAppDetails(ri);
return true;
}
diff --git a/core/java/com/android/internal/app/ResolverComparator.java b/core/java/com/android/internal/app/ResolverComparator.java
index 964a7f5..31556e2 100644
--- a/core/java/com/android/internal/app/ResolverComparator.java
+++ b/core/java/com/android/internal/app/ResolverComparator.java
@@ -48,7 +48,7 @@
private static final boolean DEBUG = false;
// Two weeks
- private static final long USAGE_STATS_PERIOD = 1000 * 60 * 60 * 24 * 7;
+ private static final long USAGE_STATS_PERIOD = 1000 * 60 * 60 * 24 * 14;
private static final long RECENCY_TIME_PERIOD = 1000 * 60 * 60 * 12;
@@ -171,27 +171,15 @@
}
}
- final boolean lPinned = lhsp.isPinned();
- final boolean rPinned = rhsp.isPinned();
+ if (mStats != null) {
+ final ScoredTarget lhsTarget = mScoredTargets.get(new ComponentName(
+ lhs.activityInfo.packageName, lhs.activityInfo.name));
+ final ScoredTarget rhsTarget = mScoredTargets.get(new ComponentName(
+ rhs.activityInfo.packageName, rhs.activityInfo.name));
+ final float diff = rhsTarget.score - lhsTarget.score;
- if (lPinned && !rPinned) {
- return -1;
- } else if (!lPinned && rPinned) {
- return 1;
- }
-
- // Pinned items stay stable within a normal lexical sort and ignore scoring.
- if (!lPinned && !rPinned) {
- if (mStats != null) {
- final ScoredTarget lhsTarget = mScoredTargets.get(new ComponentName(
- lhs.activityInfo.packageName, lhs.activityInfo.name));
- final ScoredTarget rhsTarget = mScoredTargets.get(new ComponentName(
- rhs.activityInfo.packageName, rhs.activityInfo.name));
- final float diff = rhsTarget.score - lhsTarget.score;
-
- if (diff != 0) {
- return diff > 0 ? 1 : -1;
- }
+ if (diff != 0) {
+ return diff > 0 ? 1 : -1;
}
}
diff --git a/core/java/com/android/internal/app/UnlaunchableAppActivity.java b/core/java/com/android/internal/app/UnlaunchableAppActivity.java
index aada6e3..29190f9 100644
--- a/core/java/com/android/internal/app/UnlaunchableAppActivity.java
+++ b/core/java/com/android/internal/app/UnlaunchableAppActivity.java
@@ -32,6 +32,7 @@
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
+import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -69,12 +70,11 @@
}
String dialogTitle;
- String dialogMessage;
+ String dialogMessage = null;
if (mReason == UNLAUNCHABLE_REASON_QUIET_MODE) {
dialogTitle = getResources().getString(R.string.work_mode_off_title);
dialogMessage = getResources().getString(R.string.work_mode_off_message);
} else if (mReason == UNLAUNCHABLE_REASON_SUSPENDED_PACKAGE) {
- PackageManager pm = getPackageManager();
DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(
Context.DEVICE_POLICY_SERVICE);
String packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
@@ -91,12 +91,19 @@
}
dialogTitle = String.format(getResources().getString(R.string.suspended_package_title),
packageLabel);
- dialogMessage = dpm.getShortSupportMessageForUser(dpm.getProfileOwnerAsUser(mUserId),
- mUserId);
- if (dialogMessage == null) {
- dialogMessage = String.format(
- getResources().getString(R.string.suspended_package_message),
- dpm.getProfileOwnerNameAsUser(mUserId));
+ ComponentName profileOwner = dpm.getProfileOwnerAsUser(mUserId);
+ String profileOwnerName = null;
+ if (profileOwner != null) {
+ dialogMessage = dpm.getShortSupportMessageForUser(profileOwner, mUserId);
+ profileOwnerName = dpm.getProfileOwnerNameAsUser(mUserId);
+ }
+ // Fall back to standard message if profile owner hasn't set something specific.
+ if (TextUtils.isEmpty(dialogMessage)) {
+ if (TextUtils.isEmpty(profileOwnerName)) {
+ profileOwnerName = getResources().getString(R.string.unknownName);
+ }
+ dialogMessage = getResources().getString(R.string.suspended_package_message,
+ profileOwnerName);
}
} else {
Log.wtf(TAG, "Invalid unlaunchable type: " + mReason);
diff --git a/core/java/com/android/internal/backup/LocalTransport.java b/core/java/com/android/internal/backup/LocalTransport.java
index 8cdfc64..10027b6 100644
--- a/core/java/com/android/internal/backup/LocalTransport.java
+++ b/core/java/com/android/internal/backup/LocalTransport.java
@@ -101,9 +101,6 @@
private void makeDataDirs() {
mCurrentSetDir.mkdirs();
- if (!SELinux.restorecon(mCurrentSetDir)) {
- Log.e(TAG, "SELinux restorecon failed for " + mCurrentSetDir);
- }
mCurrentSetFullDir.mkdir();
mCurrentSetIncrementalDir.mkdir();
}
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index c71c131..e2ccaae 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -8160,7 +8160,7 @@
final int size = delta.size();
for (int i = 0; i < size; i++) {
final NetworkStats.Entry entry = delta.getValues(i, mTmpNetworkStatsEntry);
- if (entry.rxPackets == 0 || entry.txPackets == 0) {
+ if (entry.rxPackets == 0 && entry.txPackets == 0) {
continue;
}
@@ -8211,13 +8211,13 @@
if (activityInfo != null) {
ControllerActivityCounterImpl activityCounter =
u.getOrCreateModemControllerActivityLocked();
- if (entry.rxPackets != 0) {
+ if (totalRxPackets > 0 && entry.rxPackets > 0) {
final long rxMs = (entry.rxPackets * activityInfo.getRxTimeMillis())
/ totalRxPackets;
activityCounter.getRxTimeCounter().addCountLocked(rxMs);
}
- if (entry.txPackets != 0) {
+ if (totalTxPackets > 0 && entry.txPackets > 0) {
for (int lvl = 0; lvl < ModemActivityInfo.TX_POWER_LEVELS; lvl++) {
long txMs = entry.txPackets * activityInfo.getTxTimeMillis()[lvl];
txMs /= totalTxPackets;
diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java
index f81658e..3b8b7cb 100644
--- a/core/java/com/android/internal/os/RuntimeInit.java
+++ b/core/java/com/android/internal/os/RuntimeInit.java
@@ -86,6 +86,13 @@
Clog_e(TAG, message.toString(), e);
}
+ // Try to end profiling. If a profiler is running at this point, and we kill the
+ // process (below), the in-memory buffer will be lost. So try to stop, which will
+ // flush the buffer. (This makes method trace profiling useful to debug crashes.)
+ if (ActivityThread.currentActivityThread() != null) {
+ ActivityThread.currentActivityThread().stopProfiling();
+ }
+
// Bring up crash dialog, wait for it to be dismissed
ActivityManagerNative.getDefault().handleApplicationCrash(
mApplicationObject, new ApplicationErrorReport.CrashInfo(e));
diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java
index 19ed11a..7637eec 100644
--- a/core/java/com/android/internal/policy/PhoneWindow.java
+++ b/core/java/com/android/internal/policy/PhoneWindow.java
@@ -675,7 +675,7 @@
}
@Override
- public void onMultiWindowModeChanged() {
+ public void onMultiWindowChanged() {
if (mDecor != null) {
mDecor.onConfigurationChanged(getContext().getResources().getConfiguration());
}
diff --git a/core/java/com/android/internal/statusbar/IStatusBar.aidl b/core/java/com/android/internal/statusbar/IStatusBar.aidl
index 632285c..3854923 100644
--- a/core/java/com/android/internal/statusbar/IStatusBar.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBar.aidl
@@ -78,5 +78,14 @@
* @param source the identifier for the gesture, see {@link StatusBarManager}
*/
void onCameraLaunchGestureDetected(int source);
-}
+ /**
+ * Request picture-in-picture.
+ *
+ * <p>
+ * This is called when an user presses picture-in-picture key or equivalent.
+ * TV device may start picture-in-picture from foreground activity if there's none.
+ * Picture-in-picture overlay menu will be shown instead otherwise.
+ */
+ void requestTvPictureInPicture();
+}
diff --git a/core/java/com/android/internal/statusbar/IStatusBarService.aidl b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
index 32de45c..a6fd9f9 100644
--- a/core/java/com/android/internal/statusbar/IStatusBarService.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
@@ -93,4 +93,14 @@
void appTransitionStarting(long statusBarAnimationsStartTime, long statusBarAnimationsDuration);
void startAssist(in Bundle args);
+
+ /**
+ * Request picture-in-picture.
+ *
+ * <p>
+ * This is called when an user presses picture-in-picture key or equivalent.
+ * TV device may start picture-in-picture from foreground activity if there's none.
+ * Picture-in-picture overlay menu will be shown instead otherwise.
+ */
+ void requestTvPictureInPicture();
}
diff --git a/core/java/com/android/internal/util/ArrayUtils.java b/core/java/com/android/internal/util/ArrayUtils.java
index ca1334c..8026949 100644
--- a/core/java/com/android/internal/util/ArrayUtils.java
+++ b/core/java/com/android/internal/util/ArrayUtils.java
@@ -186,6 +186,19 @@
return true;
}
+ /**
+ * Test if any {@code check} items are contained in {@code array}.
+ */
+ public static <T> boolean containsAny(@Nullable T[] array, T[] check) {
+ if (check == null) return false;
+ for (T checkItem : check) {
+ if (contains(array, checkItem)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public static boolean contains(@Nullable int[] array, int value) {
if (array == null) return false;
for (int element : array) {
diff --git a/core/java/com/android/internal/widget/FloatingToolbar.java b/core/java/com/android/internal/widget/FloatingToolbar.java
index 3a00469..480d806 100644
--- a/core/java/com/android/internal/widget/FloatingToolbar.java
+++ b/core/java/com/android/internal/widget/FloatingToolbar.java
@@ -920,14 +920,14 @@
mOverflowPanel.setY(mOverflowButtonSize.getHeight()); // align bottom
}
} else {
- if (hasOverflow()) {
- // overflow not open. Set closed state.
- final Size containerSize = mMainPanelSize;
- setSize(mContentContainer, containerSize);
- mMainPanel.setAlpha(1);
- mOverflowPanel.setAlpha(0);
- mOverflowButton.setImageDrawable(mOverflow);
+ // Overflow not open. Set closed state.
+ final Size containerSize = mMainPanelSize;
+ setSize(mContentContainer, containerSize);
+ mMainPanel.setAlpha(1);
+ mOverflowPanel.setAlpha(0);
+ mOverflowButton.setImageDrawable(mOverflow);
+ if (hasOverflow()) {
// Update x-coordinates depending on RTL state.
if (isRTL()) {
mContentContainer.setX(mMarginHorizontal); // align left
@@ -960,8 +960,11 @@
mOverflowPanel.setY(mOverflowButtonSize.getHeight()); // align bottom
}
} else {
- mContentContainer.setX(mMarginHorizontal);
- mContentContainer.setY(mMarginVertical);
+ // No overflow.
+ mContentContainer.setX(mMarginHorizontal); // align left
+ mContentContainer.setY(mMarginVertical); // align top
+ mMainPanel.setX(0); // align left
+ mMainPanel.setY(0); // align top
}
}
}
@@ -1092,6 +1095,7 @@
final LinkedList<MenuItem> remainingMenuItems = new LinkedList<MenuItem>(menuItems);
mMainPanel.removeAllViews();
+ mMainPanel.setPaddingRelative(0, 0, 0, 0);
boolean isFirstItem = true;
while (!remainingMenuItems.isEmpty()) {
@@ -1264,7 +1268,7 @@
}
private void maybeComputeTransitionDurationScale() {
- if (mMainPanelSize == null || mOverflowPanel == null) {
+ if (mMainPanelSize != null && mOverflowPanelSize != null) {
int w = mMainPanelSize.getWidth() - mOverflowPanelSize.getWidth();
int h = mOverflowPanelSize.getHeight() - mMainPanelSize.getHeight();
mTransitionDurationScale = (int) (Math.sqrt(w * w + h * h) /
@@ -1302,7 +1306,6 @@
overflowButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- final Drawable drawable = overflowButton.getDrawable();
if (mIsOverflowOpen) {
overflowButton.setImageDrawable(mToOverflow);
mToOverflow.start();
@@ -1599,6 +1602,8 @@
private static ViewGroup createContentContainer(Context context) {
ViewGroup contentContainer = (ViewGroup) LayoutInflater.from(context)
.inflate(R.layout.floating_popup_container, null);
+ contentContainer.setLayoutParams(new ViewGroup.LayoutParams(
+ ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
contentContainer.setTag(FLOATING_TOOLBAR_TAG);
return contentContainer;
}
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java
index 3f468ac..ba456f9 100644
--- a/core/java/com/android/internal/widget/LockPatternUtils.java
+++ b/core/java/com/android/internal/widget/LockPatternUtils.java
@@ -17,7 +17,6 @@
package com.android.internal.widget;
import android.annotation.IntDef;
-import android.app.ActivityManager;
import android.app.admin.DevicePolicyManager;
import android.app.trust.IStrongAuthTracker;
import android.app.trust.TrustManager;
@@ -503,10 +502,9 @@
if (userHandle == UserHandle.USER_SYSTEM) {
// Set the encryption password to default.
updateEncryptionPassword(StorageManager.CRYPT_TYPE_DEFAULT, null);
+ setCredentialRequiredToDecrypt(false);
}
- setCredentialRequiredToDecrypt(false);
-
getDevicePolicyManager().setActivePasswordState(
DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, 0, 0, 0, 0, 0, 0, 0, userHandle);
@@ -1340,9 +1338,9 @@
}
public void setCredentialRequiredToDecrypt(boolean required) {
- if (ActivityManager.getCurrentUser() != UserHandle.USER_SYSTEM) {
- Log.w(TAG, "Only device owner may call setCredentialRequiredForDecrypt()");
- return;
+ if (!(getUserManager().isSystemUser() || getUserManager().isPrimaryUser())) {
+ throw new IllegalStateException(
+ "Only the system or primary user may call setCredentialRequiredForDecrypt()");
}
if (isDeviceEncryptionEnabled()){
diff --git a/core/java/com/android/internal/widget/MediaNotificationView.java b/core/java/com/android/internal/widget/MediaNotificationView.java
new file mode 100644
index 0000000..b45fd06
--- /dev/null
+++ b/core/java/com/android/internal/widget/MediaNotificationView.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.internal.widget;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.RemoteViews;
+
+/**
+ * A TextView that can float around an image on the end.
+ *
+ * @hide
+ */
+@RemoteViews.RemoteView
+public class MediaNotificationView extends RelativeLayout {
+
+ private final int mMaxImageSize;
+ private final int mImageMarginBottom;
+ private final int mImageMinTopMargin;
+ private final int mNotificationContentMarginEnd;
+ private final int mNotificationContentImageMarginEnd;
+ private ImageView mRightIcon;
+ private View mActions;
+ private View mHeader;
+
+ public MediaNotificationView(Context context) {
+ this(context, null);
+ }
+
+ public MediaNotificationView(Context context, @Nullable AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public MediaNotificationView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+ this(context, attrs, defStyleAttr, 0);
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ int mode = MeasureSpec.getMode(widthMeasureSpec);
+ boolean hasIcon = mRightIcon.getVisibility() != GONE;
+ if (hasIcon && mode != MeasureSpec.UNSPECIFIED) {
+ measureChild(mActions, widthMeasureSpec, heightMeasureSpec);
+ int size = MeasureSpec.getSize(widthMeasureSpec);
+ int height = MeasureSpec.getSize(heightMeasureSpec);
+ size = size - mActions.getMeasuredWidth();
+ ViewGroup.MarginLayoutParams layoutParams =
+ (MarginLayoutParams) mRightIcon.getLayoutParams();
+ size -= layoutParams.getMarginEnd();
+ size = Math.min(size, mMaxImageSize);
+ size = Math.max(size, mRightIcon.getMinimumWidth());
+ layoutParams.width = size;
+ layoutParams.height = size;
+ // because we can't allign it to the bottom with a margin, we add a topmargin to it
+ layoutParams.topMargin = height - size - mImageMarginBottom;
+ // If the topMargin is high enough we can also remove the header constraint!
+ if (layoutParams.topMargin >= mImageMinTopMargin) {
+ resetHeaderIndention();
+ } else {
+ int paddingEnd = mNotificationContentImageMarginEnd;
+ ViewGroup.MarginLayoutParams headerParams =
+ (MarginLayoutParams) mHeader.getLayoutParams();
+ headerParams.setMarginEnd(size + layoutParams.getMarginEnd());
+ if (mHeader.getPaddingEnd() != paddingEnd) {
+ mHeader.setPadding(
+ isLayoutRtl() ? paddingEnd : mHeader.getPaddingLeft(),
+ mHeader.getPaddingTop(),
+ isLayoutRtl() ? mHeader.getPaddingLeft() : paddingEnd,
+ mHeader.getPaddingBottom());
+ mHeader.setLayoutParams(headerParams);
+ }
+ }
+ mRightIcon.setLayoutParams(layoutParams);
+ } else if (!hasIcon && mHeader.getPaddingEnd() != mNotificationContentMarginEnd) {
+ resetHeaderIndention();
+ }
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ }
+
+ private void resetHeaderIndention() {
+ if (mHeader.getPaddingEnd() != mNotificationContentMarginEnd) {
+ ViewGroup.MarginLayoutParams headerParams =
+ (MarginLayoutParams) mHeader.getLayoutParams();
+ headerParams.setMarginEnd(0);
+ mHeader.setPadding(
+ isLayoutRtl() ? mNotificationContentMarginEnd : mHeader.getPaddingLeft(),
+ mHeader.getPaddingTop(),
+ isLayoutRtl() ? mHeader.getPaddingLeft() : mNotificationContentMarginEnd,
+ mHeader.getPaddingBottom());
+ mHeader.setLayoutParams(headerParams);
+ }
+ }
+
+ public MediaNotificationView(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ mMaxImageSize = context.getResources().getDimensionPixelSize(
+ com.android.internal.R.dimen.media_notification_expanded_image_max_size);
+ mImageMarginBottom = context.getResources().getDimensionPixelSize(
+ com.android.internal.R.dimen.media_notification_expanded_image_margin_bottom);
+ mImageMinTopMargin = (int) (context.getResources().getDimensionPixelSize(
+ com.android.internal.R.dimen.notification_content_margin_top)
+ + getResources().getDisplayMetrics().density * 2);
+ mNotificationContentMarginEnd = context.getResources().getDimensionPixelSize(
+ com.android.internal.R.dimen.notification_content_margin_end);
+ mNotificationContentImageMarginEnd = context.getResources().getDimensionPixelSize(
+ com.android.internal.R.dimen.notification_content_image_margin_end);
+ }
+
+ @Override
+ protected void onFinishInflate() {
+ super.onFinishInflate();
+ mRightIcon = (ImageView) findViewById(com.android.internal.R.id.right_icon);
+ mActions = findViewById(com.android.internal.R.id.media_actions);
+ mHeader = findViewById(com.android.internal.R.id.notification_header);
+ }
+}
diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp
index b977e37..d25da78 100644
--- a/core/jni/android_media_AudioRecord.cpp
+++ b/core/jni/android_media_AudioRecord.cpp
@@ -54,6 +54,10 @@
};
static audio_attributes_fields_t javaAudioAttrFields;
static audio_record_fields_t javaAudioRecordFields;
+static struct {
+ jfieldID fieldFramePosition; // AudioTimestamp.framePosition
+ jfieldID fieldNanoTime; // AudioTimestamp.nanoTime
+} javaAudioTimestampFields;
struct audiorecord_callback_cookie {
jclass audioRecord_class;
@@ -678,7 +682,40 @@
}
}
+// ----------------------------------------------------------------------------
+static jint android_media_AudioRecord_get_timestamp(JNIEnv *env, jobject thiz,
+ jobject timestamp, jint timebase) {
+ sp<AudioRecord> lpRecorder = getAudioRecord(env, thiz);
+ if (lpRecorder == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException",
+ "Unable to retrieve AudioRecord pointer for getTimestamp()");
+ return (jint)AUDIO_JAVA_ERROR;
+ }
+
+ // TODO Enable.
+#if 0
+ // get the record timestamp
+ ExtendedTimestamp ts;
+ jint status = nativeToJavaStatus(lpRecorder->getExtendedTimestamp(&ts));
+
+ if (status == AUDIO_JAVA_SUCCESS) {
+ // set the data
+ int64_t position, time;
+
+ status = nativeToJavaStatus(ts.getBestTimestamp(&position, &time, timebase));
+ if (status == AUDIO_JAVA_SUCCESS) {
+ env->SetLongField(
+ timestamp, javaAudioTimestampFields.fieldFramePosition, position);
+ env->SetLongField(
+ timestamp, javaAudioTimestampFields.fieldNanoTime, time);
+ }
+ }
+ return status;
+#else
+ return (jint)AUDIO_JAVA_INVALID_OPERATION;
+#endif
+}
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
@@ -716,6 +753,8 @@
{"native_enableDeviceCallback", "()V", (void *)android_media_AudioRecord_enableDeviceCallback},
{"native_disableDeviceCallback", "()V",
(void *)android_media_AudioRecord_disableDeviceCallback},
+ {"native_get_timestamp", "(Landroid/media/AudioTimestamp;I)I",
+ (void *)android_media_AudioRecord_get_timestamp},
};
// field names found in android/media/AudioRecord.java
@@ -758,6 +797,13 @@
javaAudioAttrFields.fieldFormattedTags = GetFieldIDOrDie(env,
audioAttrClass, "mFormattedTags", "Ljava/lang/String;");
+ // Get the RecordTimestamp class and fields
+ jclass audioTimestampClass = FindClassOrDie(env, "android/media/AudioTimestamp");
+ javaAudioTimestampFields.fieldFramePosition =
+ GetFieldIDOrDie(env, audioTimestampClass, "framePosition", "J");
+ javaAudioTimestampFields.fieldNanoTime =
+ GetFieldIDOrDie(env, audioTimestampClass, "nanoTime", "J");
+
return RegisterMethodsOrDie(env, kClassPathName, gMethods, NELEM(gMethods));
}
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 72a9f98..a518cc4 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -226,8 +226,6 @@
<protected-broadcast android:name="android.intent.action.MEDIA_UNMOUNTABLE" />
<protected-broadcast android:name="android.intent.action.MEDIA_EJECT" />
- <protected-broadcast android:name="android.intent.action.PICTURE_IN_PICTURE_BUTTON" />
-
<protected-broadcast android:name="android.net.conn.CAPTIVE_PORTAL" />
<protected-broadcast android:name="android.net.conn.CONNECTIVITY_CHANGE" />
<!-- @deprecated. Only {@link android.net.ConnectivityManager.CONNECTIVITY_ACTION} is sent. -->
@@ -410,6 +408,7 @@
<protected-broadcast android:name="com.android.server.Wifi.action.TOGGLE_PNO" />
<protected-broadcast android:name="intent.action.ACTION_RF_BAND_INFO" />
<protected-broadcast android:name="android.intent.action.MEDIA_RESOURCE_GRANTED" />
+ <protected-broadcast android:name="android.app.action.SECURITY_LOGS_AVAILABLE" />
<protected-broadcast android:name="android.app.action.INTERRUPTION_FILTER_CHANGED" />
<protected-broadcast android:name="android.app.action.INTERRUPTION_FILTER_CHANGED_INTERNAL" />
@@ -724,7 +723,7 @@
android:protectionLevel="dangerous" />
<!-- Allows an application to write (but not read) the user's
- contacts data.
+ call log data.
<p class="note"><strong>Note:</strong> If your app uses the
{@link #WRITE_CONTACTS} permission and <em>both</em> your <a
href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code
@@ -2887,6 +2886,19 @@
android:theme="@style/Theme.Material.DayNight.DarkActionBar"
android:forceDeviceEncrypted="true"
android:encryptionAware="true">
+ <activity android:name="com.android.internal.app.ChooserActivity"
+ android:theme="@style/Theme.DeviceDefault.Resolver"
+ android:finishOnCloseSystemDialogs="true"
+ android:excludeFromRecents="true"
+ android:documentLaunchMode="never"
+ android:relinquishTaskIdentity="true"
+ android:process=":ui">
+ <intent-filter>
+ <action android:name="android.intent.action.CHOOSER" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.VOICE" />
+ </intent-filter>
+ </activity>
<activity android:name="com.android.internal.app.IntentForwarderActivity"
android:finishOnCloseSystemDialogs="true"
android:theme="@style/Theme.NoDisplay"
diff --git a/core/res/res/layout/app_anr_dialog.xml b/core/res/res/layout/app_anr_dialog.xml
new file mode 100644
index 0000000..e8169ee
--- /dev/null
+++ b/core/res/res/layout/app_anr_dialog.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingTop="@dimen/dialog_list_padding_vertical_material"
+ android:paddingBottom="@dimen/dialog_list_padding_vertical_material">
+
+ <TextView
+ android:id="@+id/aerr_close"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/aerr_close_app"
+ style="@style/aerr_list_item" />
+
+ <TextView
+ android:id="@+id/aerr_wait"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/aerr_wait"
+ style="@style/aerr_list_item" />
+
+ <TextView
+ android:id="@+id/aerr_report"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/aerr_report"
+ style="@style/aerr_list_item" />
+
+</LinearLayout>
diff --git a/core/res/res/layout/app_error_dialog.xml b/core/res/res/layout/app_error_dialog.xml
index aaa2dbc..46a2b2a 100644
--- a/core/res/res/layout/app_error_dialog.xml
+++ b/core/res/res/layout/app_error_dialog.xml
@@ -26,7 +26,7 @@
>
- <TextView
+ <Button
android:id="@+id/aerr_restart"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
style="@style/aerr_list_item"
/>
- <TextView
+ <Button
android:id="@+id/aerr_reset"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -42,7 +42,7 @@
style="@style/aerr_list_item"
/>
- <TextView
+ <Button
android:id="@+id/aerr_report"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -50,7 +50,7 @@
style="@style/aerr_list_item"
/>
- <TextView
+ <Button
android:id="@+id/aerr_close"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
style="@style/aerr_list_item"
/>
- <TextView
+ <Button
android:id="@+id/aerr_mute"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/core/res/res/layout/notification_template_material_big_media.xml b/core/res/res/layout/notification_template_material_big_media.xml
index e8ff186..aa78eff 100644
--- a/core/res/res/layout/notification_template_material_big_media.xml
+++ b/core/res/res/layout/notification_template_material_big_media.xml
@@ -16,17 +16,17 @@
-->
<!-- Layout for the expanded media notification -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.internal.widget.MediaNotificationView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/status_bar_latest_event_content"
android:layout_width="match_parent"
- android:layout_height="128dp"
+ android:layout_height="126dp"
android:background="#00000000"
android:tag="bigMediaNarrow"
>
<include layout="@layout/notification_template_header"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="48dp"
- android:layout_marginEnd="106dp"/>
+ android:layout_alignParentStart="true"/>
<LinearLayout
android:id="@+id/notification_main_column"
android:layout_width="match_parent"
@@ -34,7 +34,7 @@
android:layout_marginTop="@dimen/notification_content_margin_top"
android:layout_marginStart="@dimen/notification_content_margin_start"
android:layout_marginBottom="@dimen/notification_content_margin_bottom"
- android:layout_marginEnd="24dp"
+ android:layout_marginEnd="@dimen/notification_content_margin_end"
android:layout_toStartOf="@id/right_icon"
android:minHeight="@dimen/notification_min_content_height"
android:orientation="vertical"
@@ -57,12 +57,13 @@
</LinearLayout>
<ImageView android:id="@+id/right_icon"
- android:layout_width="96dp"
- android:layout_height="96dp"
+ android:layout_width="@dimen/media_notification_expanded_image_max_size"
+ android:layout_height="@dimen/media_notification_expanded_image_max_size"
+ android:minWidth="40dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:scaleType="centerCrop"
/>
-</RelativeLayout>
+</com.android.internal.widget.MediaNotificationView>
diff --git a/core/res/res/layout/notification_template_material_media.xml b/core/res/res/layout/notification_template_material_media.xml
index 9fcd356..aea9b44 100644
--- a/core/res/res/layout/notification_template_material_media.xml
+++ b/core/res/res/layout/notification_template_material_media.xml
@@ -24,8 +24,7 @@
>
<include layout="@layout/notification_template_header"
android:layout_width="fill_parent"
- android:layout_height="48dp"
- android:layout_marginEnd="106dp"/>
+ android:layout_height="48dp" />
<LinearLayout
android:id="@+id/notification_main_column"
android:layout_width="match_parent"
@@ -34,7 +33,6 @@
android:orientation="horizontal"
android:layout_marginStart="@dimen/notification_content_margin_start"
android:layout_marginTop="@dimen/notification_content_margin_top"
- android:layout_marginEnd="72dp"
android:tag="media"
>
<LinearLayout
diff --git a/core/res/res/layout/text_edit_suggestion_container.xml b/core/res/res/layout/text_edit_suggestion_container.xml
index fe02d4e..17e93d0 100644
--- a/core/res/res/layout/text_edit_suggestion_container.xml
+++ b/core/res/res/layout/text_edit_suggestion_container.xml
@@ -14,32 +14,41 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:background="@drawable/text_edit_suggestions_window"
- android:dropDownSelector="@drawable/list_selector_background"
- android:divider="@null">
- <ListView
- android:id="@+id/suggestionContainer"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:divider="?android:attr/dividerHorizontal">
- <!-- Suggestions will be added here. -->
- </ListView>
-
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
<LinearLayout
- android:layout_width="match_parent"
+ android:id="@+id/suggestionWindowContainer"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:divider="?android:attr/dividerHorizontal"
- android:showDividers="middle">
- <TextView
- style="@android:style/Widget.Holo.SuggestionButton"
- android:id="@+id/addToDictionaryButton"
- android:text="@string/addToDictionary" />
- <TextView
- style="@android:style/Widget.Holo.SuggestionButton"
- android:id="@+id/deleteButton"
- android:text="@string/deleteText" />
+ android:elevation="2dp"
+ android:layout_margin="20dp"
+ android:background="@drawable/text_edit_suggestions_window"
+ android:dropDownSelector="@drawable/list_selector_background"
+ android:divider="@null">
+ <ListView
+ android:id="@+id/suggestionContainer"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:divider="?android:attr/dividerHorizontal">
+ <!-- Suggestions will be added here. -->
+ </ListView>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:divider="?android:attr/dividerHorizontal"
+ android:showDividers="middle">
+ <TextView
+ style="@android:style/Widget.Holo.SuggestionButton"
+ android:id="@+id/addToDictionaryButton"
+ android:text="@string/addToDictionary" />
+ <TextView
+ style="@android:style/Widget.Holo.SuggestionButton"
+ android:id="@+id/deleteButton"
+ android:text="@string/deleteText" />
+ </LinearLayout>
</LinearLayout>
-</LinearLayout>
+</RelativeLayout>
diff --git a/core/res/res/layout/text_edit_suggestion_container_material.xml b/core/res/res/layout/text_edit_suggestion_container_material.xml
index 62e315b4..7826803 100644
--- a/core/res/res/layout/text_edit_suggestion_container_material.xml
+++ b/core/res/res/layout/text_edit_suggestion_container_material.xml
@@ -16,29 +16,38 @@
<!-- Background of the popup window is the same as the one of the floating toolbar.
Use floating toolbar background style. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:background="?android:attr/floatingToolbarPopupBackgroundDrawable"
- android:divider="?android:attr/listDivider"
- android:showDividers="middle" >
- <ListView
- android:id="@+id/suggestionContainer"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="8dip"
- android:paddingBottom="0dip"
- android:divider="@null" />
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
<LinearLayout
- android:layout_width="match_parent"
+ android:id="@+id/suggestionWindowContainer"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="vertical">
- <TextView
- style="@android:style/Widget.Material.SuggestionButton"
- android:id="@+id/addToDictionaryButton"
- android:text="@string/addToDictionary" />
- <TextView
- style="@android:style/Widget.Material.SuggestionButton"
- android:id="@+id/deleteButton"
- android:text="@string/deleteText" />
+ android:background="?android:attr/floatingToolbarPopupBackgroundDrawable"
+ android:elevation="2dp"
+ android:layout_margin="20dp"
+ android:orientation="vertical"
+ android:divider="?android:attr/listDivider"
+ android:showDividers="middle">
+ <ListView
+ android:id="@+id/suggestionContainer"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="8dp"
+ android:paddingBottom="0dp"
+ android:divider="@null" />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <TextView
+ style="@android:style/Widget.Material.SuggestionButton"
+ android:id="@+id/addToDictionaryButton"
+ android:text="@string/addToDictionary" />
+ <TextView
+ style="@android:style/Widget.Material.SuggestionButton"
+ android:id="@+id/deleteButton"
+ android:text="@string/deleteText" />
+ </LinearLayout>
</LinearLayout>
-</LinearLayout>
+</RelativeLayout>
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index 6eba78a..c744bbd 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -1288,6 +1288,7 @@
<attr name="extractNativeLibs" />
<attr name="forceDeviceEncrypted" format="boolean" />
<attr name="encryptionAware" />
+ <attr name="resizeableActivity" />
</declare-styleable>
<!-- The <code>permission</code> tag declares a security permission that can be
used to control access from other packages to specific components or
@@ -2238,21 +2239,21 @@
<!-- <code>layout</code> tag allows configuring the layout for the activity within multi-window
environment. -->
<declare-styleable name="AndroidManifestLayout" parent="AndroidManifestActivity">
- <!-- Initial width of the activity. Can be either a fixed value or fraction, in which case
+ <!-- Default width of the activity. Can be either a fixed value or fraction, in which case
the width will be constructed as a fraction of the total available width. -->
- <attr name="initialWidth" format="dimension|fraction" />
- <!-- Initial height of the activity. Can be either a fixed value or fraction, in which case
+ <attr name="defaultWidth" format="dimension|fraction" />
+ <!-- Default height of the activity. Can be either a fixed value or fraction, in which case
the height will be constructed as a fraction of the total available height. -->
- <attr name="initialHeight" format="dimension|fraction" />
+ <attr name="defaultHeight" format="dimension|fraction" />
<!-- Where to initially position the activity inside the available space. Uses constants
defined in {@link android.view.Gravity}. -->
<attr name="gravity" />
<!-- Minimal height of the activity.
- <p>NOTE: A task's root activity value is applied to all additional activities launched
- in the task. That is if the root activity of a task set minimal size, then the system
- will set the same minimal size on all other activities in the task. It will also
- ignore any other minimal size attributes of non-root activities. -->
+ <p><strong>NOTE:</strong> A task's root activity value is applied to all additional
+ activities launched in the task. That is if the root activity of a task set minimal size,
+ then the system will set the same minimal size on all other activities in the task. It will
+ also ignore any other minimal size attributes of non-root activities. -->
<attr name="minimalSize" format="dimension" />
</declare-styleable>
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index f92e7f0..7c6f338 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -146,6 +146,9 @@
<!-- The margin on the end of the content view with a picture.-->
<dimen name="notification_content_picture_margin">56dp</dimen>
+ <!-- The margin on the end of the content view with a picture in the compact media.-->
+ <dimen name="notification_content_picture_margin_media">72dp</dimen>
+
<!-- height of the content margin to accomodate for the header -->
<dimen name="notification_content_margin_top">30dp</dimen>
@@ -169,6 +172,15 @@
<!-- The minimum height of the content if there are at least two lines or a picture-->
<dimen name="notification_min_content_height">41dp</dimen>
+ <!-- The maximum size of the image in the expanded media notification -->
+ <dimen name="media_notification_expanded_image_max_size">94dp</dimen>
+
+ <!-- The maximum size of the image in the expanded media notification -->
+ <dimen name="media_notification_expanded_image_margin_bottom">16dp</dimen>
+
+ <!-- The margin of the content to an image-->
+ <dimen name="notification_content_image_margin_end">8dp</dimen>
+
<!-- Preferred width of the search view. -->
<dimen name="search_view_preferred_width">320dip</dimen>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index a2ad09b..bbbb963 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2662,8 +2662,8 @@
<public type="attr" name="listMenuViewStyle" />
<public type="attr" name="subMenuArrow" />
- <public type="attr" name="initialWidth" />
- <public type="attr" name="initialHeight" />
+ <public type="attr" name="defaultWidth" />
+ <public type="attr" name="defaultHeight" />
<public type="attr" name="minimalSize" />
<public type="attr" name="resizeableActivity" />
<public type="attr" name="supportsPictureInPicture" />
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index d960ab0..523826b 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -559,6 +559,9 @@
<!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
<string name="notification_hidden_text">Contents hidden</string>
+ <!-- Text shown in place of notification contents when the notification is hidden by policy on a secure lockscreen -->
+ <string name="notification_hidden_by_policy_text">Contents hidden by policy</string>
+
<!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
<string name="safeMode">Safe mode</string>
@@ -2594,10 +2597,9 @@
<string name="aerr_process"><xliff:g id="process">%1$s</xliff:g> has
stopped</string>
<!-- Text of the alert that is displayed when an application has crashed repeatedly. -->
- <string name="aerr_application_repeated"><xliff:g id="application">%1$s</xliff:g> is repeatedly stopping</string>
+ <string name="aerr_application_repeated"><xliff:g id="application">%1$s</xliff:g> keeps stopping</string>
<!-- Text of the alert that is displayed when a process has crashed repeatedly. -->
- <string name="aerr_process_repeated"><xliff:g id="process">%1$s</xliff:g> is
- repeatedly stopping</string>
+ <string name="aerr_process_repeated"><xliff:g id="process">%1$s</xliff:g> keeps stopping</string>
<!-- Button that restarts a crashed application -->
<string name="aerr_restart">Restart app</string>
<!-- Button that clears cache and restarts a crashed application -->
@@ -2608,17 +2610,21 @@
<string name="aerr_close">Close</string>
<!-- Button that mutes further crashes of the crashed application-->
<string name="aerr_mute">Mute</string>
+ <!-- Button that waits a bit more for an unresponsive app -->
+ <string name="aerr_wait">Wait</string>
+ <!-- Button that closes an unresponsive application -->
+ <string name="aerr_close_app">Close app</string>
<!-- Title of the alert when an application is not responding. -->
<string name="anr_title"></string>
<!-- Text of the alert that is displayed when an application is not responding. -->
- <string name="anr_activity_application"><xliff:g id="application">%2$s</xliff:g> isn\'t responding.\n\nDo you want to close it?</string>
+ <string name="anr_activity_application"><xliff:g id="application">%2$s</xliff:g> isn\'t responding</string>
<!-- Text of the alert that is displayed when an application is not responding. -->
- <string name="anr_activity_process">Activity <xliff:g id="activity">%1$s</xliff:g> isn\'t responding.\n\nDo you want to close it?</string>
+ <string name="anr_activity_process"><xliff:g id="activity">%1$s</xliff:g> isn\'t responding</string>
<!-- Text of the alert that is displayed when an application is not responding. -->
- <string name="anr_application_process"><xliff:g id="application">%1$s</xliff:g> isn\'t responding. Do you want to close it?</string>
+ <string name="anr_application_process"><xliff:g id="application">%1$s</xliff:g> isn\'t responding</string>
<!-- Text of the alert that is displayed when an application is not responding. -->
- <string name="anr_process">Process <xliff:g id="process">%1$s</xliff:g> isn\'t responding.\n\nDo you want to close it?</string>
+ <string name="anr_process">Process <xliff:g id="process">%1$s</xliff:g> isn\'t responding</string>
<!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
<string name="force_close">OK</string>
<!-- Button allowing the user to send a bug report for application which has encountered an error. -->
@@ -4000,8 +4006,10 @@
<string name="lock_to_app_unlock_password">Ask for password before unpinning</string>
<!-- Multi-Window strings -->
- <!-- Warning message when a non-resizeble tasks is docked. -->
- <string name="dock_non_resizeble_text">App is not resizeable, scroll it with two fingers.</string>
+ <!-- Warning message when a non-resizeble tasks is docked whose display windows are cropped. -->
+ <string name="dock_cropped_windows_text">App is not resizeable, scroll it with two fingers.</string>
+ <!-- Warning message when we try to dock a non-resizeble tasks and launch it in fullscreen instead. -->
+ <string name="dock_non_resizeble_failed_to_dock_text">App does not support split-screen.</string>
<!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
<string name="package_installed_device_owner">Installed by your administrator</string>
@@ -4188,10 +4196,14 @@
<string name="new_sms_notification_content">Open SMS app to view</string>
<!-- Notification title shown when user profile is credential encrypted and requires the user to unlock before some features are usable [CHAR LIMIT=30] -->
- <string name="user_encrypted_title">Device encrypted</string>
+ <string name="user_encrypted_title">Some functions might not be available</string>
<!-- Notification message shown when user profile is credential encrypted and requires the user to unlock before some features are usable [CHAR LIMIT=30] -->
- <string name="user_encrypted_message">Some functions might not be available</string>
+ <string name="user_encrypted_message">Touch to continue</string>
<!-- Notification detail shown when user profile is credential encrypted and requires the user to unlock before some features are usable [CHAR LIMIT=30] -->
- <string name="user_encrypted_detail">Touch to continue</string>
+ <string name="user_encrypted_detail">User profile locked</string>
+ <!-- Title of notification shown after a MTP device is connected to Android. -->
+ <string name="usb_mtp_launch_notification_title">Connected to <xliff:g id="product_name">%1$s</xliff:g></string>
+ <!-- Description of notification shown after a MTP device is connected to Android. -->
+ <string name="usb_mtp_launch_notification_description">Tap to view files</string>
</resources>
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index b660277..f0960c7 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -1398,7 +1398,7 @@
</style>
<!-- @hide -->
- <style name="aerr_list_item" parent="Widget.Material.Light.TextView">
+ <style name="aerr_list_item" parent="Widget.Material.Light.Button.Borderless">
<item name="minHeight">?attr/listPreferredItemHeightSmall</item>
<item name="textAppearance">?attr/textAppearanceListItemSmall</item>
<item name="textColor">?attr/textColorAlertDialogListItem</item>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 501ba92..28c01d2 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -610,7 +610,8 @@
<java-symbol type="string" name="display_manager_overlay_display_name" />
<java-symbol type="string" name="display_manager_overlay_display_secure_suffix" />
<java-symbol type="string" name="display_manager_overlay_display_title" />
- <java-symbol type="string" name="dock_non_resizeble_text" />
+ <java-symbol type="string" name="dock_cropped_windows_text" />
+ <java-symbol type="string" name="dock_non_resizeble_failed_to_dock_text" />
<java-symbol type="string" name="double_tap_toast" />
<java-symbol type="string" name="durationDays" />
<java-symbol type="string" name="durationDayHours" />
@@ -2388,6 +2389,7 @@
<java-symbol type="color" name="system_bar_background_semi_transparent" />
<!-- EditText suggestion popup. -->
+ <java-symbol type="id" name="suggestionWindowContainer" />
<java-symbol type="id" name="suggestionContainer" />
<java-symbol type="id" name="addToDictionaryButton" />
<java-symbol type="id" name="deleteButton" />
@@ -2399,6 +2401,7 @@
<java-symbol type="string" name="notification_children_count_bracketed" />
<java-symbol type="string" name="notification_hidden_text" />
+ <java-symbol type="string" name="notification_hidden_by_policy_text" />
<java-symbol type="id" name="app_name_text" />
<java-symbol type="id" name="number_of_children" />
<java-symbol type="id" name="header_sub_text" />
@@ -2502,11 +2505,21 @@
<java-symbol type="string" name="new_sms_notification_title" />
<java-symbol type="string" name="new_sms_notification_content" />
+ <java-symbol type="dimen" name="media_notification_expanded_image_max_size" />
+ <java-symbol type="dimen" name="media_notification_expanded_image_margin_bottom" />
+ <java-symbol type="dimen" name="notification_content_image_margin_end" />
+ <java-symbol type="dimen" name="notification_content_picture_margin_media" />
+
<java-symbol type="bool" name="config_strongAuthRequiredOnBoot" />
+ <java-symbol type="layout" name="app_anr_dialog" />
+ <java-symbol type="id" name="aerr_wait" />
+
<!-- Encryption notification while accounts are locked by credential encryption -->
<java-symbol type="string" name="user_encrypted_title" />
<java-symbol type="string" name="user_encrypted_message" />
<java-symbol type="string" name="user_encrypted_detail" />
+ <java-symbol type="string" name="usb_mtp_launch_notification_title" />
+ <java-symbol type="string" name="usb_mtp_launch_notification_description" />
</resources>
diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk
index fc40554..587a366 100644
--- a/libs/hwui/Android.mk
+++ b/libs/hwui/Android.mk
@@ -248,7 +248,8 @@
tests/unit/VectorDrawableTests.cpp \
tests/unit/OffscreenBufferPoolTests.cpp \
tests/unit/StringUtilsTests.cpp \
- tests/unit/BufferPoolTests.cpp
+ tests/unit/BufferPoolTests.cpp \
+ tests/unit/TextDropShadowCacheTests.cpp
ifeq (true, $(HWUI_NEW_OPS))
LOCAL_SRC_FILES += \
diff --git a/libs/hwui/BakedOpRenderer.cpp b/libs/hwui/BakedOpRenderer.cpp
index 5736c70..35c8f6b 100644
--- a/libs/hwui/BakedOpRenderer.cpp
+++ b/libs/hwui/BakedOpRenderer.cpp
@@ -43,7 +43,7 @@
mRenderTarget.offscreenBuffer = offscreenBuffer;
// create and bind framebuffer
- mRenderTarget.frameBufferId = mRenderState.genFramebuffer();
+ mRenderTarget.frameBufferId = mRenderState.createFramebuffer();
mRenderState.bindFramebuffer(mRenderTarget.frameBufferId);
// attach the texture to the FBO
diff --git a/libs/hwui/LayerRenderer.cpp b/libs/hwui/LayerRenderer.cpp
index 3123e8e..e04b9a2 100644
--- a/libs/hwui/LayerRenderer.cpp
+++ b/libs/hwui/LayerRenderer.cpp
@@ -189,7 +189,7 @@
LAYER_RENDERER_LOGD("Requesting new render layer %dx%d", width, height);
Caches& caches = Caches::getInstance();
- GLuint fbo = renderState.genFramebuffer();
+ GLuint fbo = renderState.createFramebuffer();
if (!fbo) {
ALOGW("Could not obtain an FBO");
return nullptr;
@@ -357,7 +357,7 @@
&& bitmap->width() <= caches.maxTextureSize
&& bitmap->height() <= caches.maxTextureSize) {
- GLuint fbo = renderState.getFramebuffer();
+ GLuint fbo = renderState.createFramebuffer();
if (!fbo) {
ALOGW("Could not obtain an FBO");
return false;
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 6c2e244..587be92 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -674,7 +674,7 @@
bool OpenGLRenderer::createFboLayer(Layer* layer, Rect& bounds, Rect& clip) {
layer->clipRect.set(clip);
- layer->setFbo(mRenderState.genFramebuffer());
+ layer->setFbo(mRenderState.createFramebuffer());
writableSnapshot()->region = &writableSnapshot()->layer->region;
writableSnapshot()->flags |= Snapshot::kFlagFboTarget | Snapshot::kFlagIsFboLayer;
diff --git a/libs/hwui/TextDropShadowCache.cpp b/libs/hwui/TextDropShadowCache.cpp
index 62a20fc..1707468 100644
--- a/libs/hwui/TextDropShadowCache.cpp
+++ b/libs/hwui/TextDropShadowCache.cpp
@@ -148,7 +148,7 @@
void TextDropShadowCache::operator()(ShadowText&, ShadowTexture*& texture) {
if (texture) {
- mSize -= texture->bitmapSize;
+ mSize -= texture->objectSize();
if (mDebugEnabled) {
ALOGD("Shadow texture deleted, size = %d", texture->bitmapSize);
@@ -195,7 +195,9 @@
// Don't even try to cache a bitmap that's bigger than the cache
if (size < mMaxSize) {
while (mSize + size > mMaxSize) {
- mCache.removeOldest();
+ LOG_ALWAYS_FATAL_IF(!mCache.removeOldest(),
+ "Failed to remove oldest from cache. mSize = %"
+ PRIu32 ", mCache.size() = %zu", mSize, mCache.size());
}
}
@@ -212,7 +214,7 @@
entry.copyTextLocally();
- mSize += size;
+ mSize += texture->objectSize();
mCache.put(entry, texture);
} else {
texture->cleanup = true;
diff --git a/libs/hwui/VectorDrawable.cpp b/libs/hwui/VectorDrawable.cpp
index 4d4acb9..1cf15ac 100644
--- a/libs/hwui/VectorDrawable.cpp
+++ b/libs/hwui/VectorDrawable.cpp
@@ -201,7 +201,6 @@
needsFill = true;
} else if (mFillColor != SK_ColorTRANSPARENT) {
mPaint.setColor(applyAlpha(mFillColor, mFillAlpha));
- outCanvas->drawPath(renderPath, mPaint);
needsFill = true;
}
diff --git a/libs/hwui/renderstate/RenderState.cpp b/libs/hwui/renderstate/RenderState.cpp
index 81363d9..e535f2f 100644
--- a/libs/hwui/renderstate/RenderState.cpp
+++ b/libs/hwui/renderstate/RenderState.cpp
@@ -144,7 +144,7 @@
}
}
-GLuint RenderState::genFramebuffer() {
+GLuint RenderState::createFramebuffer() {
GLuint ret;
glGenFramebuffers(1, &ret);
return ret;
diff --git a/libs/hwui/renderstate/RenderState.h b/libs/hwui/renderstate/RenderState.h
index e5d3e79..731d9bb 100644
--- a/libs/hwui/renderstate/RenderState.h
+++ b/libs/hwui/renderstate/RenderState.h
@@ -64,7 +64,7 @@
void bindFramebuffer(GLuint fbo);
GLuint getFramebuffer() { return mFramebuffer; }
- GLuint genFramebuffer();
+ GLuint createFramebuffer();
void deleteFramebuffer(GLuint fbo);
void invokeFunctor(Functor* functor, DrawGlInfo::Mode mode, DrawGlInfo* info);
diff --git a/libs/hwui/tests/unit/TextDropShadowCacheTests.cpp b/libs/hwui/tests/unit/TextDropShadowCacheTests.cpp
new file mode 100644
index 0000000..c54f2c3
--- /dev/null
+++ b/libs/hwui/tests/unit/TextDropShadowCacheTests.cpp
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+
+#include "GammaFontRenderer.h"
+#include "TextDropShadowCache.h"
+#include "utils/Blur.h"
+#include "tests/common/TestUtils.h"
+
+#include <SkBlurDrawLooper.h>
+#include <SkPaint.h>
+
+using namespace android;
+using namespace android::uirenderer;
+
+RENDERTHREAD_TEST(TextDropShadowCache, addRemove) {
+ GammaFontRenderer gammaFontRenderer;
+ FontRenderer& fontRenderer = gammaFontRenderer.getFontRenderer();
+ TextDropShadowCache cache(5000);
+ cache.setFontRenderer(fontRenderer);
+
+ SkPaint paint;
+ paint.setLooper(SkBlurDrawLooper::Create((SkColor)0xFFFFFFFF,
+ Blur::convertRadiusToSigma(10), 10, 10))->unref();
+ std::string msg("This is a test");
+ std::unique_ptr<float[]> positions(new float[msg.length()]);
+ for (size_t i = 0; i < msg.length(); i++) {
+ positions[i] = i * 10.0f;
+ }
+ fontRenderer.setFont(&paint, SkMatrix::I());
+ ShadowTexture* texture = cache.get(&paint, msg.c_str(), msg.length(),
+ 10.0f, positions.get());
+ ASSERT_TRUE(texture);
+ ASSERT_FALSE(texture->cleanup);
+ ASSERT_EQ((uint32_t) texture->objectSize(), cache.getSize());
+ ASSERT_TRUE(cache.getSize());
+ cache.clear();
+ ASSERT_EQ(cache.getSize(), 0u);
+}
diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java
index 7c21893..800b914 100644
--- a/media/java/android/media/AudioRecord.java
+++ b/media/java/android/media/AudioRecord.java
@@ -826,6 +826,33 @@
}
/**
+ * Poll for an {@link AudioTimestamp} on demand.
+ * <p>
+ * The AudioTimestamp reflects the frame delivery information at
+ * the earliest point available in the capture pipeline.
+ * <p>
+ * Calling {@link #startRecording()} following a {@link #stop()} will reset
+ * the frame count to 0.
+ *
+ * @param timestamp a reference to a non-null AudioTimestamp instance.
+ * @param timebase one of
+ * {@link AudioTimestamp#TIMEBASE_BOOTTIME AudioTimestamp.TIMEBASE_BOOTTIME} or
+ * {@link AudioTimestamp#TIMEBASE_MONOTONIC AudioTimestamp.TIMEBASE_MONOTONIC}.
+ * @return {@link #SUCCESS} if a timestamp is available,
+ * or {@link #ERROR_INVALID_OPERATION} if a timestamp not available.
+ */
+ public int getTimestamp(@NonNull AudioTimestamp timestamp,
+ @AudioTimestamp.Timebase int timebase)
+ {
+ if (timestamp == null ||
+ (timebase != AudioTimestamp.TIMEBASE_BOOTTIME
+ && timebase != AudioTimestamp.TIMEBASE_MONOTONIC)) {
+ throw new IllegalArgumentException();
+ }
+ return native_get_timestamp(timestamp, timebase);
+ }
+
+ /**
* Returns the minimum buffer size required for the successful creation of an AudioRecord
* object, in byte units.
* Note that this size doesn't guarantee a smooth recording under load, and higher values
@@ -1709,6 +1736,9 @@
private native final void native_enableDeviceCallback();
private native final void native_disableDeviceCallback();
+ private native final int native_get_timestamp(@NonNull AudioTimestamp timestamp,
+ @AudioTimestamp.Timebase int timebase);
+
//---------------------------------------------------------
// Utility methods
//------------------
diff --git a/media/java/android/media/AudioTimestamp.java b/media/java/android/media/AudioTimestamp.java
index 965ba85..be8ca15 100644
--- a/media/java/android/media/AudioTimestamp.java
+++ b/media/java/android/media/AudioTimestamp.java
@@ -16,29 +16,74 @@
package android.media;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import android.annotation.IntDef;
+
/**
* Structure that groups a position in frame units relative to an assumed audio stream,
- * together with the estimated time when that frame was presented or is committed to be
- * presented.
- * In the case of audio output, "present" means that audio produced on device
- * is detectable by an external observer off device.
+ * together with the estimated time when that frame enters or leaves the audio
+ * processing pipeline on that device. This can be used to coordinate events
+ * and interactions with the external environment.
+ * <p>
* The time is based on the implementation's best effort, using whatever knowledge
* is available to the system, but cannot account for any delay unknown to the implementation.
*
- * @see AudioTrack#getTimestamp
+ * @see AudioTrack#getTimestamp AudioTrack.getTimestamp(AudioTimestamp)
+ * @see AudioRecord#getTimestamp AudioRecord.getTimestamp(AudioTimestamp, int)
*/
public final class AudioTimestamp
{
/**
+ * Clock monotonic or its equivalent on the system,
+ * in the same units and timebase as {@link java.lang.System#nanoTime}.
+ */
+ public static final int TIMEBASE_MONOTONIC = 0;
+
+ /**
+ * Clock monotonic including suspend time or its equivalent on the system,
+ * in the same units and timebase as {@link android.os.SystemClock#elapsedRealtimeNanos}.
+ */
+ public static final int TIMEBASE_BOOTTIME = 1;
+
+ /** @hide */
+ @IntDef({
+ TIMEBASE_MONOTONIC,
+ TIMEBASE_BOOTTIME,
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface Timebase {}
+
+ /**
* Position in frames relative to start of an assumed audio stream.
- * The low-order 32 bits of position is in wrapping frame units similar to
- * {@link AudioTrack#getPlaybackHeadPosition}.
+ * <p>
+ * When obtained through
+ * {@link AudioRecord#getTimestamp AudioRecord.getTimestamp(AudioTimestamp, int)},
+ * all 64 bits of position are valid.
+ * <p>
+ * When obtained through
+ * {@link AudioTrack#getTimestamp AudioTrack.getTimestamp(AudioTimestamp)},
+ * the low-order 32 bits of position is in wrapping frame units similar to
+ * {@link AudioTrack#getPlaybackHeadPosition AudioTrack.getPlaybackHeadPosition()}.
*/
public long framePosition;
/**
- * The estimated time when frame was presented or is committed to be presented,
- * in the same units and timebase as {@link java.lang.System#nanoTime}.
+ * Time associated with the frame in the audio pipeline.
+ * <p>
+ * When obtained through
+ * {@link AudioRecord#getTimestamp AudioRecord.getTimestamp(AudioTimestamp, int)},
+ * this is the estimated time in nanoseconds when the frame referred to by
+ * {@link #framePosition} was captured. The timebase is either
+ * {@link #TIMEBASE_MONOTONIC} or {@link #TIMEBASE_BOOTTIME}, depending
+ * on the timebase parameter used in
+ * {@link AudioRecord#getTimestamp AudioRecord.getTimestamp(AudioTimestamp, int)}.
+ * <p>
+ * When obtained through
+ * {@link AudioTrack#getTimestamp AudioTrack.getTimestamp(AudioTimestamp)},
+ * this is the estimated time when the frame was presented or is committed to be presented,
+ * with a timebase of {@link #TIMEBASE_MONOTONIC}.
*/
public long nanoTime;
}
diff --git a/media/java/android/media/audiopolicy/AudioMixingRule.java b/media/java/android/media/audiopolicy/AudioMixingRule.java
index b9fcba2..f9fdd8d 100644
--- a/media/java/android/media/audiopolicy/AudioMixingRule.java
+++ b/media/java/android/media/audiopolicy/AudioMixingRule.java
@@ -146,7 +146,8 @@
}
private static boolean isValidSystemApiRule(int rule) {
- switch(rule) {
+ // API rules only expose the RULE_MATCH_* rules
+ switch (rule) {
case RULE_MATCH_ATTRIBUTE_USAGE:
case RULE_MATCH_ATTRIBUTE_CAPTURE_PRESET:
case RULE_MATCH_UID:
@@ -155,9 +156,9 @@
return false;
}
}
-
private static boolean isValidAttributesSystemApiRule(int rule) {
- switch(rule) {
+ // API rules only expose the RULE_MATCH_* rules
+ switch (rule) {
case RULE_MATCH_ATTRIBUTE_USAGE:
case RULE_MATCH_ATTRIBUTE_CAPTURE_PRESET:
return true;
@@ -167,13 +168,11 @@
}
private static boolean isValidRule(int rule) {
- switch(rule) {
+ final int match_rule = rule & ~RULE_EXCLUSION_MASK;
+ switch (match_rule) {
case RULE_MATCH_ATTRIBUTE_USAGE:
- case RULE_EXCLUDE_ATTRIBUTE_USAGE:
case RULE_MATCH_ATTRIBUTE_CAPTURE_PRESET:
- case RULE_EXCLUDE_ATTRIBUTE_CAPTURE_PRESET:
case RULE_MATCH_UID:
- case RULE_EXCLUDE_UID:
return true;
default:
return false;
@@ -327,24 +326,10 @@
private Builder checkAddRuleObjInternal(int rule, Object property)
throws IllegalArgumentException {
if (property == null) {
- throw new IllegalArgumentException("Illegal null Object argument");
+ throw new IllegalArgumentException("Illegal null argument for mixing rule");
}
if (!isValidRule(rule)) {
throw new IllegalArgumentException("Illegal rule value " + rule);
- } else {
- // as rules are added to the Builder, we verify they are consistent with the type
- // of mix being built. When adding the first rule, the mix type is MIX_TYPE_INVALID.
- if (mTargetMixType == AudioMix.MIX_TYPE_INVALID) {
- if (isPlayerRule(rule)) {
- mTargetMixType = AudioMix.MIX_TYPE_PLAYERS;
- } else {
- mTargetMixType = AudioMix.MIX_TYPE_RECORDERS;
- }
- } else if (((mTargetMixType == AudioMix.MIX_TYPE_PLAYERS) && !isPlayerRule(rule))
- || ((mTargetMixType == AudioMix.MIX_TYPE_RECORDERS) && isPlayerRule(rule)))
- {
- throw new IllegalArgumentException("Incompatible rule for mix");
- }
}
final int match_rule = rule & ~RULE_EXCLUSION_MASK;
if (isAudioAttributeRule(match_rule)) {
@@ -379,6 +364,19 @@
*/
private Builder addRuleInternal(AudioAttributes attrToMatch, Integer intProp, int rule)
throws IllegalArgumentException {
+ // as rules are added to the Builder, we verify they are consistent with the type
+ // of mix being built. When adding the first rule, the mix type is MIX_TYPE_INVALID.
+ if (mTargetMixType == AudioMix.MIX_TYPE_INVALID) {
+ if (isPlayerRule(rule)) {
+ mTargetMixType = AudioMix.MIX_TYPE_PLAYERS;
+ } else {
+ mTargetMixType = AudioMix.MIX_TYPE_RECORDERS;
+ }
+ } else if (((mTargetMixType == AudioMix.MIX_TYPE_PLAYERS) && !isPlayerRule(rule))
+ || ((mTargetMixType == AudioMix.MIX_TYPE_RECORDERS) && isPlayerRule(rule)))
+ {
+ throw new IllegalArgumentException("Incompatible rule for mix");
+ }
synchronized (mCriteria) {
Iterator<AttributeMatchCriterion> crIterator = mCriteria.iterator();
final int match_rule = rule & ~RULE_EXCLUSION_MASK;
@@ -430,6 +428,7 @@
}
}
// rule didn't exist, add it
+ // FIXME doesn't work with RULE_MATCH_UID yet
mCriteria.add(new AttributeMatchCriterion(attrToMatch, rule));
}
return this;
diff --git a/media/java/android/media/browse/MediaBrowser.java b/media/java/android/media/browse/MediaBrowser.java
index 869512d..93e6dac 100644
--- a/media/java/android/media/browse/MediaBrowser.java
+++ b/media/java/android/media/browse/MediaBrowser.java
@@ -473,8 +473,9 @@
// the service will be told when we connect.
if (mState == CONNECT_STATE_CONNECTED) {
try {
- // NOTE: In order not to break the behavior of the support library, call
- // addSubscription instead of addSubscriptionWithOptions when the options are null.
+ // NOTE: Do not call addSubscriptionWithOptions when options are null. Otherwise,
+ // it will break the action of support library which expects addSubscription will
+ // be called when options are null.
if (options == null) {
mServiceBinder.addSubscription(parentId, mServiceCallbacks);
} else {
@@ -500,9 +501,9 @@
// Tell the service if necessary.
if (sub != null && sub.remove(options) && mState == CONNECT_STATE_CONNECTED) {
try {
- // NOTE: In order not to break the behavior of the support library, call
- // removeSubscription instead of removeSubscriptionWithOptions when the options
- // are null.
+ // NOTE: Do not call removeSubscriptionWithOptions when options are null. Otherwise,
+ // it will break the action of support library which expects removeSubscription will
+ // be called when options are null.
if (options == null) {
mServiceBinder.removeSubscription(parentId, mServiceCallbacks);
} else {
@@ -572,9 +573,9 @@
Subscription sub = subscriptionEntry.getValue();
for (Bundle options : sub.getOptionsList()) {
try {
- // NOTE: In order not to break the behavior of the support library,
- // call addSubscription instead of addSubscriptionWithOptions when
- // the options are null.
+ // NOTE: Do not call addSubscriptionWithOptions when options are null.
+ // Otherwise, it will break the action of support library which expects
+ // addSubscription will be called when options are null.
if (options == null) {
mServiceBinder.addSubscription(id, mServiceCallbacks);
} else {
@@ -1034,7 +1035,7 @@
* are the initial data as requested.
*/
@Override
- public void onConnect(final String root, final MediaSession.Token session,
+ public void onConnect(String root, MediaSession.Token session,
final Bundle extras) {
MediaBrowser mediaBrowser = mMediaBrowser.get();
if (mediaBrowser != null) {
@@ -1054,7 +1055,12 @@
}
@Override
- public void onLoadChildren(final String parentId, final ParceledListSlice list,
+ public void onLoadChildren(String parentId, ParceledListSlice list) {
+ onLoadChildrenWithOptions(parentId, list, null);
+ }
+
+ @Override
+ public void onLoadChildrenWithOptions(String parentId, ParceledListSlice list,
final Bundle options) {
MediaBrowser mediaBrowser = mMediaBrowser.get();
if (mediaBrowser != null) {
diff --git a/media/java/android/media/session/MediaController.java b/media/java/android/media/session/MediaController.java
index b1a51a56..3d9b60d 100644
--- a/media/java/android/media/session/MediaController.java
+++ b/media/java/android/media/session/MediaController.java
@@ -605,6 +605,7 @@
/**
* Request that the player start playback for a specific media id.
*
+ * @see PlaybackState#EXTRA_PREPARE_ONLY
* @param mediaId The id of the requested media.
* @param extras Optional extras that can include extra information about the media item
* to be played.
@@ -626,6 +627,7 @@
* An empty or null query should be treated as a request to play any
* music.
*
+ * @see PlaybackState#EXTRA_PREPARE_ONLY
* @param query The search query.
* @param extras Optional extras that can include extra information
* about the query.
@@ -646,6 +648,7 @@
/**
* Request that the player start playback for a specific {@link Uri}.
*
+ * @see PlaybackState#EXTRA_PREPARE_ONLY
* @param uri The URI of the requested media.
* @param extras Optional extras that can include extra information about the media item
* to be played.
diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java
index e1e9b79..8c5b19c 100644
--- a/media/java/android/media/session/MediaSession.java
+++ b/media/java/android/media/session/MediaSession.java
@@ -87,6 +87,12 @@
public static final int FLAG_HANDLES_TRANSPORT_CONTROLS = 1 << 1;
/**
+ * Set this flag on the session to indicate that it can handle
+ * the {@link PlaybackState#EXTRA_PREPARE_ONLY} field.
+ */
+ public static final int FLAG_HANDLES_PREPARE_ONLY = 1 << 2;
+
+ /**
* System only flag for a session that needs to have priority over all other
* sessions. This flag ensures this session will receive media button events
* regardless of the current ordering in the system.
@@ -100,6 +106,7 @@
@IntDef(flag = true, value = {
FLAG_HANDLES_MEDIA_BUTTONS,
FLAG_HANDLES_TRANSPORT_CONTROLS,
+ FLAG_HANDLES_PREPARE_ONLY,
FLAG_EXCLUSIVE_GLOBAL_PRIORITY })
public @interface SessionFlags { }
diff --git a/media/java/android/media/session/PlaybackState.java b/media/java/android/media/session/PlaybackState.java
index bbe04b5..1079a1f 100644
--- a/media/java/android/media/session/PlaybackState.java
+++ b/media/java/android/media/session/PlaybackState.java
@@ -133,6 +133,21 @@
public static final long ACTION_PLAY_FROM_URI = 1 << 13;
/**
+ * Used as an optional boolean extra field in
+ * {@link MediaController.TransportControls#playFromMediaId},
+ * {@link MediaController.TransportControls#playFromSearch}, and
+ * {@link MediaController.TransportControls#playFromUri}. Value of {@code true} overrides
+ * the default behavior of starting the playback after preparing. Check
+ * {@link MediaSession#FLAG_HANDLES_PREPARE_ONLY} to see if the media session supports this.
+ *
+ * @see MediaSession#FLAG_HANDLES_PREPARE_ONLY
+ * @see MediaController.TransportControls#playFromMediaId
+ * @see MediaController.TransportControls#playFromSearch
+ * @see MediaController.TransportControls#playFromUri
+ */
+ public static final String EXTRA_PREPARE_ONLY = "android.media.session.extra.PREPARE_ONLY";
+
+ /**
* This is the default playback state and indicates that no media has been
* added yet, or the performer has been reset and has no content to play.
*
diff --git a/media/java/android/media/tv/ITvInputManager.aidl b/media/java/android/media/tv/ITvInputManager.aidl
index 0febc16..d189333 100644
--- a/media/java/android/media/tv/ITvInputManager.aidl
+++ b/media/java/android/media/tv/ITvInputManager.aidl
@@ -41,6 +41,7 @@
interface ITvInputManager {
List<TvInputInfo> getTvInputList(int userId);
TvInputInfo getTvInputInfo(in String inputId, int userId);
+ void setTvInputInfo(in TvInputInfo inputInfo, int userId);
int getTvInputState(in String inputId, int userId);
List<TvContentRatingSystemInfo> getTvContentRatingSystemList(int userId);
diff --git a/media/java/android/media/tv/ITvInputManagerCallback.aidl b/media/java/android/media/tv/ITvInputManagerCallback.aidl
index 3bf415b..395c9f3 100644
--- a/media/java/android/media/tv/ITvInputManagerCallback.aidl
+++ b/media/java/android/media/tv/ITvInputManagerCallback.aidl
@@ -29,5 +29,5 @@
void onInputStateChanged(in String inputId, int state);
- void onTvInputInfoChanged(in String inputId, in TvInputInfo TvInputInfo);
+ void onTvInputInfoChanged(in TvInputInfo TvInputInfo);
}
diff --git a/media/java/android/media/tv/ITvInputServiceCallback.aidl b/media/java/android/media/tv/ITvInputServiceCallback.aidl
index 9f13882..4fdc102 100644
--- a/media/java/android/media/tv/ITvInputServiceCallback.aidl
+++ b/media/java/android/media/tv/ITvInputServiceCallback.aidl
@@ -24,9 +24,7 @@
* @hide
*/
oneway interface ITvInputServiceCallback {
- void addHardwareTvInput(in int deviceId, in TvInputInfo inputInfo);
- void addHdmiTvInput(in int id, in TvInputInfo inputInfo);
- void removeTvInput(in String inputId);
-
- void setTvInputInfo(in String inputId, in TvInputInfo inputInfo);
+ void addHardwareInput(in int deviceId, in TvInputInfo inputInfo);
+ void addHdmiInput(in int id, in TvInputInfo inputInfo);
+ void removeHardwareInput(in String inputId);
}
diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java
index 671a86f..20491e4 100644
--- a/media/java/android/media/tv/TvInputInfo.java
+++ b/media/java/android/media/tv/TvInputInfo.java
@@ -107,15 +107,6 @@
*/
public static final String EXTRA_INPUT_ID = "android.media.tv.extra.INPUT_ID";
- private static final SparseIntArray sHardwareTypeToTvInputType = new SparseIntArray();
-
- private static final String XML_START_TAG_NAME = "tv-input";
- private static final String DELIMITER_INFO_IN_ID = "/";
- private static final String PREFIX_HDMI_DEVICE = "HDMI";
- private static final String PREFIX_HARDWARE_DEVICE = "HW";
- private static final int LENGTH_HDMI_PHYSICAL_ADDRESS = 4;
- private static final int LENGTH_HDMI_DEVICE_ID = 2;
-
private final ResolveInfo mService;
private final String mId;
private final String mParentId;
@@ -137,21 +128,6 @@
private Uri mIconUri;
private boolean mIsConnectedToHdmiSwitch;
- static {
- sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_OTHER_HARDWARE,
- TYPE_OTHER);
- sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_TUNER, TYPE_TUNER);
- sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_COMPOSITE, TYPE_COMPOSITE);
- sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_SVIDEO, TYPE_SVIDEO);
- sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_SCART, TYPE_SCART);
- sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_COMPONENT, TYPE_COMPONENT);
- sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_VGA, TYPE_VGA);
- sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_DVI, TYPE_DVI);
- sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_HDMI, TYPE_HDMI);
- sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_DISPLAY_PORT,
- TYPE_DISPLAY_PORT);
- }
-
/**
* Create a new instance of the TvInputInfo class, instantiating it from the given Context,
* ResolveInfo, and HdmiDeviceInfo.
@@ -260,93 +236,6 @@
.build();
}
- static TvInputInfo createTvInputInfo(Context context, ResolveInfo resolveInfo, Icon icon,
- int labelResId, int tunerCount, boolean canRecord, HdmiDeviceInfo hdmiDeviceInfo,
- String parentId, TvInputHardwareInfo tvInputHardwareInfo)
- throws IOException, XmlPullParserException {
- ComponentName componentName = new ComponentName(resolveInfo.serviceInfo.packageName,
- resolveInfo.serviceInfo.name);
- String id;
- int type;
- boolean isHardwareInput = false;
- boolean isConnectedToHdmiSwitch = false;
-
- if (hdmiDeviceInfo != null) {
- id = generateInputIdForHdmiDevice(componentName, hdmiDeviceInfo);
- type = TYPE_HDMI;
- isHardwareInput = true;
- isConnectedToHdmiSwitch = (hdmiDeviceInfo.getPhysicalAddress() & 0x0FFF) != 0;
- tunerCount = 0;
- } else if (tvInputHardwareInfo != null) {
- id = generateInputIdForHardware(componentName, tvInputHardwareInfo);
- type = sHardwareTypeToTvInputType.get(tvInputHardwareInfo.getType(), TYPE_TUNER);
- isHardwareInput = true;
- tunerCount = 0;
- } else {
- id = generateInputIdForComponentName(componentName);
- type = TYPE_TUNER;
- }
-
- TvInputInfo info = new TvInputInfo(resolveInfo, id, parentId, type, isHardwareInput,
- isConnectedToHdmiSwitch, tunerCount, canRecord);
- return parseServiceMetadata(context, resolveInfo, type, info);
- }
-
- private static TvInputInfo parseServiceMetadata(
- Context context, ResolveInfo service, int inputType, TvInputInfo input)
- throws XmlPullParserException, IOException {
- ServiceInfo si = service.serviceInfo;
- PackageManager pm = context.getPackageManager();
- XmlResourceParser parser = null;
- try {
- parser = si.loadXmlMetaData(pm, TvInputService.SERVICE_META_DATA);
- if (parser == null) {
- throw new XmlPullParserException("No " + TvInputService.SERVICE_META_DATA
- + " meta-data for " + si.name);
- }
-
- Resources res = pm.getResourcesForApplication(si.applicationInfo);
- AttributeSet attrs = Xml.asAttributeSet(parser);
-
- int type;
- while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
- && type != XmlPullParser.START_TAG) {
- }
-
- String nodeName = parser.getName();
- if (!XML_START_TAG_NAME.equals(nodeName)) {
- throw new XmlPullParserException(
- "Meta-data does not start with tv-input-service tag in " + si.name);
- }
-
- TypedArray sa = res.obtainAttributes(attrs,
- com.android.internal.R.styleable.TvInputService);
- input.mSetupActivity = sa.getString(
- com.android.internal.R.styleable.TvInputService_setupActivity);
- if (DEBUG) {
- Log.d(TAG, "Setup activity loaded. [" + input.mSetupActivity + "] for " + si.name);
- }
- if (inputType == TYPE_TUNER && TextUtils.isEmpty(input.mSetupActivity)) {
- throw new XmlPullParserException("Setup activity not found in " + si.name);
- }
- input.mSettingsActivity = sa.getString(
- com.android.internal.R.styleable.TvInputService_settingsActivity);
- if (DEBUG) {
- Log.d(TAG, "Settings activity loaded. [" + input.mSettingsActivity + "] for "
- + si.name);
- }
- sa.recycle();
-
- } catch (NameNotFoundException e) {
- throw new XmlPullParserException("Unable to create context for: " + si.packageName);
- } finally {
- if (parser != null) {
- parser.close();
- }
- }
- return input;
- }
-
/**
* Constructor.
*
@@ -645,46 +534,6 @@
return mService.serviceInfo.loadIcon(context.getPackageManager());
}
- /**
- * Used to generate an input id from a ComponentName.
- *
- * @param name the component name for generating an input id.
- * @return the generated input id for the given {@code name}.
- */
- private static String generateInputIdForComponentName(ComponentName name) {
- return name.flattenToShortString();
- }
-
- /**
- * Used to generate an input id from a ComponentName and HdmiDeviceInfo.
- *
- * @param name the component name for generating an input id.
- * @param deviceInfo HdmiDeviceInfo describing this TV input.
- * @return the generated input id for the given {@code name} and {@code deviceInfo}.
- */
- private static String generateInputIdForHdmiDevice(
- ComponentName name, HdmiDeviceInfo deviceInfo) {
- // Example of the format : "/HDMI%04X%02X"
- String format = DELIMITER_INFO_IN_ID + PREFIX_HDMI_DEVICE
- + "%0" + LENGTH_HDMI_PHYSICAL_ADDRESS + "X"
- + "%0" + LENGTH_HDMI_DEVICE_ID + "X";
- return name.flattenToShortString() + String.format(Locale.ENGLISH, format,
- deviceInfo.getPhysicalAddress(), deviceInfo.getId());
- }
-
- /**
- * Used to generate an input id from a ComponentName and TvInputHardwareInfo
- *
- * @param name the component name for generating an input id.
- * @param hardwareInfo TvInputHardwareInfo describing this TV input.
- * @return the generated input id for the given {@code name} and {@code hardwareInfo}.
- */
- private static String generateInputIdForHardware(
- ComponentName name, TvInputHardwareInfo hardwareInfo) {
- return name.flattenToShortString() + DELIMITER_INFO_IN_ID + PREFIX_HARDWARE_DEVICE
- + hardwareInfo.getDeviceId();
- }
-
public static final Parcelable.Creator<TvInputInfo> CREATOR =
new Parcelable.Creator<TvInputInfo>() {
@Override
@@ -720,6 +569,32 @@
* A convenience builder for creating {@link TvInputInfo} objects.
*/
public static final class Builder {
+ private static final int LENGTH_HDMI_PHYSICAL_ADDRESS = 4;
+ private static final int LENGTH_HDMI_DEVICE_ID = 2;
+
+ private static final String XML_START_TAG_NAME = "tv-input";
+ private static final String DELIMITER_INFO_IN_ID = "/";
+ private static final String PREFIX_HDMI_DEVICE = "HDMI";
+ private static final String PREFIX_HARDWARE_DEVICE = "HW";
+
+ private static final SparseIntArray sHardwareTypeToTvInputType = new SparseIntArray();
+ static {
+ sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_OTHER_HARDWARE,
+ TYPE_OTHER);
+ sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_TUNER, TYPE_TUNER);
+ sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_COMPOSITE,
+ TYPE_COMPOSITE);
+ sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_SVIDEO, TYPE_SVIDEO);
+ sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_SCART, TYPE_SCART);
+ sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_COMPONENT,
+ TYPE_COMPONENT);
+ sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_VGA, TYPE_VGA);
+ sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_DVI, TYPE_DVI);
+ sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_HDMI, TYPE_HDMI);
+ sHardwareTypeToTvInputType.put(TvInputHardwareInfo.TV_INPUT_TYPE_DISPLAY_PORT,
+ TYPE_DISPLAY_PORT);
+ }
+
private final Context mContext;
private final ResolveInfo mResolveInfo;
private Icon mIcon;
@@ -864,11 +739,102 @@
* @return TvInputInfo containing information about this TV input.
* @throws IOException If there was an I/O error.
* @throws XmlPullParserException If there was an XML parsing error.
- *
*/
public TvInputInfo build() throws IOException, XmlPullParserException {
- return createTvInputInfo(mContext, mResolveInfo, mIcon, mLabelResId, mTunerCount,
- mCanRecord, mHdmiDeviceInfo, mParentId, mTvInputHardwareInfo);
+ ComponentName componentName = new ComponentName(mResolveInfo.serviceInfo.packageName,
+ mResolveInfo.serviceInfo.name);
+ String id;
+ int type;
+ boolean isHardwareInput = false;
+ boolean isConnectedToHdmiSwitch = false;
+
+ if (mHdmiDeviceInfo != null) {
+ id = generateInputId(componentName, mHdmiDeviceInfo);
+ type = TYPE_HDMI;
+ isHardwareInput = true;
+ isConnectedToHdmiSwitch = (mHdmiDeviceInfo.getPhysicalAddress() & 0x0FFF) != 0;
+ mTunerCount = 0;
+ } else if (mTvInputHardwareInfo != null) {
+ id = generateInputId(componentName, mTvInputHardwareInfo);
+ type = sHardwareTypeToTvInputType.get(mTvInputHardwareInfo.getType(), TYPE_TUNER);
+ isHardwareInput = true;
+ mTunerCount = 0;
+ } else {
+ id = generateInputId(componentName);
+ type = TYPE_TUNER;
+ }
+
+ TvInputInfo info = new TvInputInfo(mResolveInfo, id, mParentId, type, isHardwareInput,
+ isConnectedToHdmiSwitch, mTunerCount, mCanRecord);
+ return parseServiceMetadata(type, info);
+ }
+
+ private static String generateInputId(ComponentName name) {
+ return name.flattenToShortString();
+ }
+
+ private static String generateInputId(ComponentName name, HdmiDeviceInfo hdmiDeviceInfo) {
+ // Example of the format : "/HDMI%04X%02X"
+ String format = DELIMITER_INFO_IN_ID + PREFIX_HDMI_DEVICE
+ + "%0" + LENGTH_HDMI_PHYSICAL_ADDRESS + "X"
+ + "%0" + LENGTH_HDMI_DEVICE_ID + "X";
+ return name.flattenToShortString() + String.format(Locale.ENGLISH, format,
+ hdmiDeviceInfo.getPhysicalAddress(), hdmiDeviceInfo.getId());
+ }
+
+ private static String generateInputId(ComponentName name,
+ TvInputHardwareInfo tvInputHardwareInfo) {
+ return name.flattenToShortString() + DELIMITER_INFO_IN_ID + PREFIX_HARDWARE_DEVICE
+ + tvInputHardwareInfo.getDeviceId();
+ }
+
+ private TvInputInfo parseServiceMetadata(int inputType, TvInputInfo info)
+ throws XmlPullParserException, IOException {
+ ServiceInfo si = mResolveInfo.serviceInfo;
+ PackageManager pm = mContext.getPackageManager();
+ try (XmlResourceParser parser =
+ si.loadXmlMetaData(pm, TvInputService.SERVICE_META_DATA)) {
+ if (parser == null) {
+ throw new XmlPullParserException("No " + TvInputService.SERVICE_META_DATA
+ + " meta-data for " + si.name);
+ }
+
+ Resources res = pm.getResourcesForApplication(si.applicationInfo);
+ AttributeSet attrs = Xml.asAttributeSet(parser);
+
+ int type;
+ while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+ && type != XmlPullParser.START_TAG) {
+ }
+
+ String nodeName = parser.getName();
+ if (!XML_START_TAG_NAME.equals(nodeName)) {
+ throw new XmlPullParserException(
+ "Meta-data does not start with tv-input-service tag in " + si.name);
+ }
+
+ TypedArray sa = res.obtainAttributes(attrs,
+ com.android.internal.R.styleable.TvInputService);
+ info.mSetupActivity = sa.getString(
+ com.android.internal.R.styleable.TvInputService_setupActivity);
+ if (DEBUG) {
+ Log.d(TAG, "Setup activity loaded. [" + info.mSetupActivity + "] for "
+ + si.name);
+ }
+ if (inputType == TYPE_TUNER && TextUtils.isEmpty(info.mSetupActivity)) {
+ throw new XmlPullParserException("Setup activity not found in " + si.name);
+ }
+ info.mSettingsActivity = sa.getString(
+ com.android.internal.R.styleable.TvInputService_settingsActivity);
+ if (DEBUG) {
+ Log.d(TAG, "Settings activity loaded. [" + info.mSettingsActivity + "] for "
+ + si.name);
+ }
+ sa.recycle();
+ } catch (NameNotFoundException e) {
+ throw new XmlPullParserException("Unable to create context for: " + si.packageName);
+ }
+ return info;
}
}
diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java
index f1de8fd..1cd1958 100644
--- a/media/java/android/media/tv/TvInputManager.java
+++ b/media/java/android/media/tv/TvInputManager.java
@@ -719,19 +719,16 @@
* the media on which a newer version of the package exists becomes available/unavailable.
*
* @param inputId The ID of the TV input.
- * @hide
*/
- @SystemApi
public void onInputUpdated(String inputId) {
}
/**
- * This is called when the information about a given TV input is changed.
+ * This is called when the information about a given TV input has been changed.
*
- * @param inputId The ID of the TV input.
* @param inputInfo TvInputInfo object that contains the information about the TV input.
*/
- public void onTvInputInfoChanged(String inputId, TvInputInfo inputInfo) {
+ public void onTvInputInfoChanged(TvInputInfo inputInfo) {
}
}
@@ -784,11 +781,11 @@
});
}
- public void postTvInputInfoChanged(final String inputId, final TvInputInfo inputInfo) {
+ public void postTvInputInfoChanged(final TvInputInfo inputInfo) {
mHandler.post(new Runnable() {
@Override
public void run() {
- mCallback.onTvInputInfoChanged(inputId, inputInfo);
+ mCallback.onTvInputInfoChanged(inputInfo);
}
});
}
@@ -1089,10 +1086,10 @@
}
@Override
- public void onTvInputInfoChanged(String inputId, TvInputInfo inputInfo) {
+ public void onTvInputInfoChanged(TvInputInfo inputInfo) {
synchronized (mLock) {
for (TvInputCallbackRecord record : mCallbackRecords) {
- record.postTvInputInfoChanged(inputId, inputInfo);
+ record.postTvInputInfoChanged(inputInfo);
}
}
}
@@ -1143,6 +1140,23 @@
}
/**
+ * Sets a new TvInputInfo object for a given input.
+ *
+ * <p>This is called internally only by {@link TvInputService}.
+ *
+ * @param inputInfo The TvInputInfo object to set.
+ * @throws IllegalArgumentException if the argument is {@code null}.
+ */
+ void setTvInputInfo(@NonNull TvInputInfo inputInfo) {
+ Preconditions.checkNotNull(inputInfo);
+ try {
+ mService.setTvInputInfo(inputInfo, mUserId);
+ } catch (RemoteException e) {
+ throw new RuntimeException("Error trying to set " + inputInfo, e);
+ }
+ }
+
+ /**
* Returns the state of a given TV input.
*
* <p>The state is one of the following:
diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java
index f74ae66..d48b2c8 100644
--- a/media/java/android/media/tv/TvInputService.java
+++ b/media/java/android/media/tv/TvInputService.java
@@ -150,25 +150,25 @@
@Override
public void notifyHardwareAdded(TvInputHardwareInfo hardwareInfo) {
- mServiceHandler.obtainMessage(ServiceHandler.DO_ADD_HARDWARE_TV_INPUT,
+ mServiceHandler.obtainMessage(ServiceHandler.DO_ADD_HARDWARE_INPUT,
hardwareInfo).sendToTarget();
}
@Override
public void notifyHardwareRemoved(TvInputHardwareInfo hardwareInfo) {
- mServiceHandler.obtainMessage(ServiceHandler.DO_REMOVE_HARDWARE_TV_INPUT,
+ mServiceHandler.obtainMessage(ServiceHandler.DO_REMOVE_HARDWARE_INPUT,
hardwareInfo).sendToTarget();
}
@Override
public void notifyHdmiDeviceAdded(HdmiDeviceInfo deviceInfo) {
- mServiceHandler.obtainMessage(ServiceHandler.DO_ADD_HDMI_TV_INPUT,
+ mServiceHandler.obtainMessage(ServiceHandler.DO_ADD_HDMI_INPUT,
deviceInfo).sendToTarget();
}
@Override
public void notifyHdmiDeviceRemoved(HdmiDeviceInfo deviceInfo) {
- mServiceHandler.obtainMessage(ServiceHandler.DO_REMOVE_HDMI_TV_INPUT,
+ mServiceHandler.obtainMessage(ServiceHandler.DO_REMOVE_HDMI_INPUT,
deviceInfo).sendToTarget();
}
};
@@ -262,16 +262,16 @@
* <p>The system service automatically creates the TvInputInfo for each TV input based on
* information collected from the AndroidManifest.xml, thus it is not necessary to call this
* method unless the TV input has additional information to pass such as ability to record and
- * tuner count.
+ * tuner count. Attempting to change information about a TV input that the calling package does
+ * not own does nothing.
*
- * @param inputId The ID of the TV input.
+ * @param context The application context.
* @param inputInfo The TvInputInfo object that contains that new information.
*/
- public final void setTvInputInfo(String inputId, TvInputInfo inputInfo) {
- SomeArgs args = SomeArgs.obtain();
- args.arg1 = inputId;
- args.arg2 = inputInfo;
- mServiceHandler.obtainMessage(ServiceHandler.DO_SET_TV_INPUT_INFO, args).sendToTarget();
+ public static final void setTvInputInfo(Context context, TvInputInfo inputInfo) {
+ TvInputManager manager = (TvInputManager) context.getSystemService(
+ Context.TV_INPUT_SERVICE);
+ manager.setTvInputInfo(inputInfo);
}
private boolean isPassthroughInput(String inputId) {
@@ -525,7 +525,7 @@
public void notifyVideoUnavailable(final int reason) {
if (reason < TvInputManager.VIDEO_UNAVAILABLE_REASON_START
|| reason > TvInputManager.VIDEO_UNAVAILABLE_REASON_END) {
- throw new IllegalArgumentException("Unknown reason: " + reason);
+ Log.e(TAG, "notifyVideoUnavailable - unknown reason: " + reason);
}
executeOrPostRunnableOnMainThread(new Runnable() {
@MainThread
@@ -1934,55 +1934,42 @@
private static final int DO_CREATE_SESSION = 1;
private static final int DO_NOTIFY_SESSION_CREATED = 2;
private static final int DO_CREATE_RECORDING_SESSION = 3;
- private static final int DO_ADD_HARDWARE_TV_INPUT = 4;
- private static final int DO_REMOVE_HARDWARE_TV_INPUT = 5;
- private static final int DO_ADD_HDMI_TV_INPUT = 6;
- private static final int DO_REMOVE_HDMI_TV_INPUT = 7;
- private static final int DO_SET_TV_INPUT_INFO = 8;
+ private static final int DO_ADD_HARDWARE_INPUT = 4;
+ private static final int DO_REMOVE_HARDWARE_INPUT = 5;
+ private static final int DO_ADD_HDMI_INPUT = 6;
+ private static final int DO_REMOVE_HDMI_INPUT = 7;
- private void broadcastAddHardwareTvInput(int deviceId, TvInputInfo inputInfo) {
+ private void broadcastAddHardwareInput(int deviceId, TvInputInfo inputInfo) {
int n = mCallbacks.beginBroadcast();
for (int i = 0; i < n; ++i) {
try {
- mCallbacks.getBroadcastItem(i).addHardwareTvInput(deviceId, inputInfo);
+ mCallbacks.getBroadcastItem(i).addHardwareInput(deviceId, inputInfo);
} catch (RemoteException e) {
- Log.e(TAG, "error in broadcastAddHardwareTvInput", e);
+ Log.e(TAG, "error in broadcastAddHardwareInput", e);
}
}
mCallbacks.finishBroadcast();
}
- private void broadcastAddHdmiTvInput(int id, TvInputInfo inputInfo) {
+ private void broadcastAddHdmiInput(int id, TvInputInfo inputInfo) {
int n = mCallbacks.beginBroadcast();
for (int i = 0; i < n; ++i) {
try {
- mCallbacks.getBroadcastItem(i).addHdmiTvInput(id, inputInfo);
+ mCallbacks.getBroadcastItem(i).addHdmiInput(id, inputInfo);
} catch (RemoteException e) {
- Log.e(TAG, "error in broadcastAddHdmiTvInput", e);
+ Log.e(TAG, "error in broadcastAddHdmiInput", e);
}
}
mCallbacks.finishBroadcast();
}
- private void broadcastRemoveTvInput(String inputId) {
+ private void broadcastRemoveHardwareInput(String inputId) {
int n = mCallbacks.beginBroadcast();
for (int i = 0; i < n; ++i) {
try {
- mCallbacks.getBroadcastItem(i).removeTvInput(inputId);
+ mCallbacks.getBroadcastItem(i).removeHardwareInput(inputId);
} catch (RemoteException e) {
- Log.e(TAG, "error in broadcastRemoveTvInput", e);
- }
- }
- mCallbacks.finishBroadcast();
- }
-
- private void broadcastSetTvInputInfo(String inputId, TvInputInfo inputInfo) {
- int n = mCallbacks.beginBroadcast();
- for (int i = 0; i < n; ++i) {
- try {
- mCallbacks.getBroadcastItem(i).setTvInputInfo(inputId, inputInfo);
- } catch (RemoteException e) {
- Log.e(TAG, "error in broadcastSetTvInputInfo", e);
+ Log.e(TAG, "error in broadcastRemoveHardwareInput", e);
}
}
mCallbacks.finishBroadcast();
@@ -2088,48 +2075,38 @@
recordingSessionImpl.initialize(cb);
return;
}
- case DO_ADD_HARDWARE_TV_INPUT: {
+ case DO_ADD_HARDWARE_INPUT: {
TvInputHardwareInfo hardwareInfo = (TvInputHardwareInfo) msg.obj;
TvInputInfo inputInfo = onHardwareAdded(hardwareInfo);
if (inputInfo != null) {
- broadcastAddHardwareTvInput(hardwareInfo.getDeviceId(), inputInfo);
+ broadcastAddHardwareInput(hardwareInfo.getDeviceId(), inputInfo);
}
return;
}
- case DO_REMOVE_HARDWARE_TV_INPUT: {
+ case DO_REMOVE_HARDWARE_INPUT: {
TvInputHardwareInfo hardwareInfo = (TvInputHardwareInfo) msg.obj;
String inputId = onHardwareRemoved(hardwareInfo);
if (inputId != null) {
- broadcastRemoveTvInput(inputId);
+ broadcastRemoveHardwareInput(inputId);
}
return;
}
- case DO_ADD_HDMI_TV_INPUT: {
+ case DO_ADD_HDMI_INPUT: {
HdmiDeviceInfo deviceInfo = (HdmiDeviceInfo) msg.obj;
TvInputInfo inputInfo = onHdmiDeviceAdded(deviceInfo);
if (inputInfo != null) {
- broadcastAddHdmiTvInput(deviceInfo.getId(), inputInfo);
+ broadcastAddHdmiInput(deviceInfo.getId(), inputInfo);
}
return;
}
- case DO_REMOVE_HDMI_TV_INPUT: {
+ case DO_REMOVE_HDMI_INPUT: {
HdmiDeviceInfo deviceInfo = (HdmiDeviceInfo) msg.obj;
String inputId = onHdmiDeviceRemoved(deviceInfo);
if (inputId != null) {
- broadcastRemoveTvInput(inputId);
+ broadcastRemoveHardwareInput(inputId);
}
return;
}
- case DO_SET_TV_INPUT_INFO: {
- SomeArgs args = (SomeArgs) msg.obj;
- String inputId = (String) args.arg1;
- TvInputInfo inputInfo = (TvInputInfo) args.arg2;
- if (inputInfo != null) {
- broadcastSetTvInputInfo(inputId, inputInfo);
- }
- args.recycle();
- return;
- }
default: {
Log.w(TAG, "Unhandled message code: " + msg.what);
return;
diff --git a/media/java/android/media/tv/TvRecordingClient.java b/media/java/android/media/tv/TvRecordingClient.java
index 865e000..73f1e32 100644
--- a/media/java/android/media/tv/TvRecordingClient.java
+++ b/media/java/android/media/tv/TvRecordingClient.java
@@ -184,7 +184,7 @@
* Callback used to receive various status updates on the
* {@link android.media.tv.TvInputService.RecordingSession}
*/
- public class RecordingCallback {
+ public abstract static class RecordingCallback {
/**
* This is called when a recording session initiated by a call to
* {@link #connect(String, Uri)} has been established.
diff --git a/media/java/android/service/media/IMediaBrowserService.aidl b/media/java/android/service/media/IMediaBrowserService.aidl
index fe7ebfa..6ca5ac5 100644
--- a/media/java/android/service/media/IMediaBrowserService.aidl
+++ b/media/java/android/service/media/IMediaBrowserService.aidl
@@ -16,7 +16,7 @@
oneway interface IMediaBrowserService {
// Warning: DO NOT CHANGE the methods signature and order of methods.
- // The change of the order or the method signatures could break the support library.
+ // A change of the order or the method signatures could break the support library.
void connect(String pkg, in Bundle rootHints, IMediaBrowserServiceCallbacks callbacks);
void disconnect(IMediaBrowserServiceCallbacks callbacks);
diff --git a/media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl b/media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl
index dadb025..e6b0e8c 100644
--- a/media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl
+++ b/media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl
@@ -13,6 +13,10 @@
* @hide
*/
oneway interface IMediaBrowserServiceCallbacks {
+
+ // Warning: DO NOT CHANGE the methods signature and order of methods.
+ // A change of the order or the method signatures could break the support library.
+
/**
* Invoked when the connected has been established.
* @param root The root media id for browsing.
@@ -22,5 +26,6 @@
*/
void onConnect(String root, in MediaSession.Token session, in Bundle extras);
void onConnectFailed();
- void onLoadChildren(String mediaId, in ParceledListSlice list, in Bundle options);
+ void onLoadChildren(String mediaId, in ParceledListSlice list);
+ void onLoadChildrenWithOptions(String mediaId, in ParceledListSlice list, in Bundle options);
}
diff --git a/media/java/android/service/media/MediaBrowserService.java b/media/java/android/service/media/MediaBrowserService.java
index 6cf90d5..299b770 100644
--- a/media/java/android/service/media/MediaBrowserService.java
+++ b/media/java/android/service/media/MediaBrowserService.java
@@ -589,7 +589,14 @@
final ParceledListSlice<MediaBrowser.MediaItem> pls =
filteredList == null ? null : new ParceledListSlice<>(filteredList);
try {
- connection.callbacks.onLoadChildren(parentId, pls, options);
+ // NOTE: Do not call onLoadChildrenWithOptions when options are null. Otherwise,
+ // it will break the action of support library which expects onLoadChildren will
+ // be called when options are null.
+ if (options == null) {
+ connection.callbacks.onLoadChildren(parentId, pls);
+ } else {
+ connection.callbacks.onLoadChildrenWithOptions(parentId, pls, options);
+ }
} catch (RemoteException ex) {
// The other side is in the process of crashing.
Log.w(TAG, "Calling onLoadChildren() failed for id=" + parentId
diff --git a/media/jni/android_media_MediaDataSource.cpp b/media/jni/android_media_MediaDataSource.cpp
index 025133f..3b892cb 100644
--- a/media/jni/android_media_MediaDataSource.cpp
+++ b/media/jni/android_media_MediaDataSource.cpp
@@ -150,4 +150,8 @@
mJavaObjStatus = UNKNOWN_ERROR;
}
+uint32_t JMediaDataSource::getFlags() {
+ return 0;
+}
+
} // namespace android
diff --git a/media/jni/android_media_MediaDataSource.h b/media/jni/android_media_MediaDataSource.h
index 2bc237e..34624eb 100644
--- a/media/jni/android_media_MediaDataSource.h
+++ b/media/jni/android_media_MediaDataSource.h
@@ -45,6 +45,7 @@
virtual ssize_t readAt(off64_t offset, size_t size);
virtual status_t getSize(off64_t* size);
virtual void close();
+ virtual uint32_t getFlags();
private:
// Protect all member variables with mLock because this object will be
diff --git a/media/jni/android_media_Utils.cpp b/media/jni/android_media_Utils.cpp
index 5108eb5..c08a5e3 100644
--- a/media/jni/android_media_Utils.cpp
+++ b/media/jni/android_media_Utils.cpp
@@ -81,7 +81,8 @@
bool GetExifFromRawImage(
FileStream* stream, const String8& filename, piex::PreviewImageData& image_data) {
- memset(&image_data, 0, sizeof(image_data));
+ // Reset the PreviewImageData to its default.
+ image_data = piex::PreviewImageData();
if (!stream->exists()) {
// File is not exists.
diff --git a/media/tests/MediaFrameworkTest/Android.mk b/media/tests/MediaFrameworkTest/Android.mk
index 42da48d..6b9fdb6 100644
--- a/media/tests/MediaFrameworkTest/Android.mk
+++ b/media/tests/MediaFrameworkTest/Android.mk
@@ -7,7 +7,11 @@
LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := easymocklib mockito-target core-tests android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := easymocklib \
+ mockito-target \
+ core-tests \
+ android-support-test \
+ android-ex-camera2
LOCAL_PACKAGE_NAME := mediaframeworktest
diff --git a/media/tests/MediaFrameworkTest/AndroidManifest.xml b/media/tests/MediaFrameworkTest/AndroidManifest.xml
index c62199f..3185ea2 100644
--- a/media/tests/MediaFrameworkTest/AndroidManifest.xml
+++ b/media/tests/MediaFrameworkTest/AndroidManifest.xml
@@ -34,50 +34,61 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
+ <activity android:label="Camera2CtsActivity"
+ android:name="Camera2SurfaceViewActivity"
+ android:screenOrientation="landscape"
+ android:configChanges="keyboardHidden|orientation|screenSize">
+ </activity>
</application>
<instrumentation android:name=".CameraStressTestRunner"
- android:targetPackage="com.android.mediaframeworktest"
- android:label="Camera stress tests InstrumentationRunner">
+ android:targetPackage="com.android.mediaframeworktest"
+ android:label="Camera stress tests InstrumentationRunner">
+ </instrumentation>
+
+ <instrumentation android:name=".Camera2InstrumentationTestRunner"
+ android:targetPackage="com.android.mediaframeworktest"
+ android:label="Camera2 InstrumentationTestRunner">
</instrumentation>
<instrumentation android:name=".MediaFrameworkTestRunner"
- android:targetPackage="com.android.mediaframeworktest"
- android:label="MediaFramework tests InstrumentationRunner">
- </instrumentation>
+ android:targetPackage="com.android.mediaframeworktest"
+ android:label="MediaFramework tests InstrumentationRunner">
+ </instrumentation>
- <instrumentation android:name=".MediaFrameworkPerfTestRunner"
- android:targetPackage="com.android.mediaframeworktest"
- android:label="MediaFramework Performance tests InstrumentationRunner">
- </instrumentation>
+ <instrumentation android:name=".MediaFrameworkPerfTestRunner"
+ android:targetPackage="com.android.mediaframeworktest"
+ android:label="MediaFramework Performance tests InstrumentationRunner">
+ </instrumentation>
- <instrumentation android:name=".MediaFrameworkUnitTestRunner"
- android:targetPackage="com.android.mediaframeworktest"
- android:label="MediaFramework unit tests InstrumentationRunner">
- </instrumentation>
+ <instrumentation android:name=".MediaFrameworkUnitTestRunner"
+ android:targetPackage="com.android.mediaframeworktest"
+ android:label="MediaFramework unit tests InstrumentationRunner">
+ </instrumentation>
- <instrumentation android:name=".MediaRecorderStressTestRunner"
- android:targetPackage="com.android.mediaframeworktest"
- android:label="MediaRecorder stress tests InstrumentationRunner">
- </instrumentation>
+ <instrumentation android:name=".MediaRecorderStressTestRunner"
+ android:targetPackage="com.android.mediaframeworktest"
+ android:label="MediaRecorder stress tests InstrumentationRunner">
+ </instrumentation>
- <instrumentation android:name=".MediaFrameworkPowerTestRunner"
- android:targetPackage="com.android.mediaframeworktest"
- android:label="Media Power tests InstrumentationRunner">
- </instrumentation>
+ <instrumentation android:name=".MediaFrameworkPowerTestRunner"
+ android:targetPackage="com.android.mediaframeworktest"
+ android:label="Media Power tests InstrumentationRunner">
+ </instrumentation>
- <instrumentation android:name=".MediaPlayerStressTestRunner"
- android:targetPackage="com.android.mediaframeworktest"
- android:label="Media Power tests InstrumentationRunner">
- </instrumentation>
+ <instrumentation android:name=".MediaPlayerStressTestRunner"
+ android:targetPackage="com.android.mediaframeworktest"
+ android:label="Media Power tests InstrumentationRunner">
+ </instrumentation>
<instrumentation android:name=".MediaFrameworkIntegrationTestRunner"
- android:targetPackage="com.android.mediaframeworktest"
- android:label="MediaFramework integration tests InstrumentationRunner">
- </instrumentation>
+ android:targetPackage="com.android.mediaframeworktest"
+ android:label="MediaFramework integration tests InstrumentationRunner">
+ </instrumentation>
- <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.mediaframeworktest"
- android:label="media framework tests"/>
+ <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.mediaframeworktest"
+ android:label="media framework tests">
+ </instrumentation>
</manifest>
diff --git a/media/tests/MediaFrameworkTest/res/layout/surface_view_2.xml b/media/tests/MediaFrameworkTest/res/layout/surface_view_2.xml
new file mode 100644
index 0000000..fe53c71
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/res/layout/surface_view_2.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <SurfaceView
+ android:id="@+id/surface_view"
+ android:layout_width="320dp"
+ android:layout_height="240dp"/>
+
+</LinearLayout>
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2InstrumentationTestRunner.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2InstrumentationTestRunner.java
new file mode 100644
index 0000000..d9228dc
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2InstrumentationTestRunner.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mediaframeworktest;
+
+import com.android.mediaframeworktest.stress.Camera2CaptureRequestTest;
+import com.android.mediaframeworktest.stress.Camera2RecordingTest;
+import com.android.mediaframeworktest.stress.Camera2ReprocessCaptureTest;
+import com.android.mediaframeworktest.stress.Camera2StillCaptureTest;
+
+import junit.framework.TestSuite;
+
+import android.test.InstrumentationTestRunner;
+import android.test.InstrumentationTestSuite;
+
+/**
+ * This is Camera2 framework test runner to execute the specified test classes if no target class
+ * is defined in the meta-data or command line argument parameters.
+ */
+public class Camera2InstrumentationTestRunner extends InstrumentationTestRunner {
+
+ @Override
+ public TestSuite getAllTests() {
+ TestSuite suite = new InstrumentationTestSuite(this);
+ // Note the following test cases are compatible with Camera API2
+ suite.addTestSuite(Camera2StillCaptureTest.class);
+ suite.addTestSuite(Camera2RecordingTest.class);
+ suite.addTestSuite(Camera2ReprocessCaptureTest.class);
+ suite.addTestSuite(Camera2CaptureRequestTest.class);
+ return suite;
+ }
+
+ @Override
+ public ClassLoader getLoader() {
+ return Camera2InstrumentationTestRunner.class.getClassLoader();
+ }
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2SurfaceViewActivity.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2SurfaceViewActivity.java
new file mode 100644
index 0000000..c3dd842
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2SurfaceViewActivity.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mediaframeworktest;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.ConditionVariable;
+import android.os.SystemClock;
+import android.util.Log;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.WindowManager;
+
+/**
+ * (non-Javadoc)
+ * @see android.hardware.camera2.cts.Camera2SurfaceViewCtsActivity
+ */
+public class Camera2SurfaceViewActivity extends Activity implements SurfaceHolder.Callback {
+ private static final String TAG = "SurfaceViewActivity";
+ private final ConditionVariable surfaceChangedDone = new ConditionVariable();
+
+ private SurfaceView mSurfaceView;
+ private int currentWidth = 0;
+ private int currentHeight = 0;
+ private final Object sizeLock = new Object();
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.surface_view_2);
+ mSurfaceView = (SurfaceView) findViewById(R.id.surface_view);
+ mSurfaceView.getHolder().addCallback(this);
+
+ //Acquire the full wake lock to keep the device up
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+ }
+
+ public SurfaceView getSurfaceView() {
+ return mSurfaceView;
+ }
+
+ public boolean waitForSurfaceSizeChanged(int timeOutMs, int expectWidth, int expectHeight) {
+ if (timeOutMs <= 0 || expectWidth <= 0 || expectHeight <= 0) {
+ throw new IllegalArgumentException(
+ String.format(
+ "timeout(%d), expectWidth(%d), and expectHeight(%d) " +
+ "should all be positive numbers",
+ timeOutMs, expectWidth, expectHeight));
+ }
+
+ synchronized(sizeLock) {
+ if (expectWidth == currentWidth && expectHeight == currentHeight) {
+ return true;
+ }
+ }
+
+ int waitTimeMs = timeOutMs;
+ boolean changeSucceeded = false;
+ while (!changeSucceeded && waitTimeMs > 0) {
+ long startTimeMs = SystemClock.elapsedRealtime();
+ changeSucceeded = surfaceChangedDone.block(waitTimeMs);
+ if (!changeSucceeded) {
+ Log.e(TAG, "Wait for surface change timed out after " + timeOutMs + " ms");
+ return changeSucceeded;
+ } else {
+ // Get a surface change callback, need to check if the size is expected.
+ surfaceChangedDone.close();
+ if (currentWidth == expectWidth && currentHeight == expectHeight) {
+ return changeSucceeded;
+ }
+ // Do a further iteration surface change check as surfaceChanged could be called
+ // again.
+ changeSucceeded = false;
+ }
+ waitTimeMs -= (SystemClock.elapsedRealtime() - startTimeMs);
+ }
+
+ // Couldn't get expected surface size change.
+ return false;
+ }
+
+ @Override
+ public void surfaceCreated(SurfaceHolder holder) {
+ }
+
+ @Override
+ public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+ Log.i(TAG, "Surface Changed to: " + width + "x" + height);
+ synchronized (sizeLock) {
+ currentWidth = width;
+ currentHeight = height;
+ }
+ surfaceChangedDone.open();
+ }
+
+ @Override
+ public void surfaceDestroyed(SurfaceHolder holder) {
+ }
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2SurfaceViewTestCase.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2SurfaceViewTestCase.java
new file mode 100644
index 0000000..74da2c9
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2SurfaceViewTestCase.java
@@ -0,0 +1,804 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mediaframeworktest;
+
+import com.android.ex.camera2.blocking.BlockingSessionCallback;
+import com.android.ex.camera2.blocking.BlockingStateCallback;
+import com.android.ex.camera2.exceptions.TimeoutRuntimeException;
+import com.android.mediaframeworktest.helpers.CameraErrorCollector;
+import com.android.mediaframeworktest.helpers.CameraTestResultPrinter;
+import com.android.mediaframeworktest.helpers.CameraTestUtils;
+import com.android.mediaframeworktest.helpers.CameraTestUtils.SimpleCaptureCallback;
+import com.android.mediaframeworktest.helpers.StaticMetadata;
+import com.android.mediaframeworktest.helpers.StaticMetadata.CheckLevel;
+
+import android.content.Context;
+import android.graphics.ImageFormat;
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraCaptureSession;
+import android.hardware.camera2.CameraCaptureSession.CaptureCallback;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CameraManager;
+import android.hardware.camera2.CameraMetadata;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.media.ImageReader;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.InstrumentationTestRunner;
+import android.util.Log;
+import android.util.Range;
+import android.util.Size;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.WindowManager;
+
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import static com.android.ex.camera2.blocking.BlockingStateCallback.STATE_CLOSED;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.CAMERA_CLOSE_TIMEOUT_MS;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.MAX_READER_IMAGES;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.PREVIEW_SIZE_BOUND;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.configureCameraSession;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.getPreviewSizeBound;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.getSupportedPreviewSizes;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.getSupportedStillSizes;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.getSupportedVideoSizes;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.makeImageReader;
+
+/**
+ * Camera2 Preview test case base class by using SurfaceView as rendering target.
+ *
+ * <p>This class encapsulates the SurfaceView based preview common functionalities.
+ * The setup and teardown of CameraManager, test HandlerThread, Activity, Camera IDs
+ * and CameraStateCallback are handled in this class. Some basic preview related utility
+ * functions are provided to facilitate the derived preview-based test classes.
+ * </p>
+ */
+/**
+ * (non-Javadoc)
+ * @see android.hardware.camera2.cts.Camera2SurfaceViewTestCase
+ */
+public class Camera2SurfaceViewTestCase extends
+ ActivityInstrumentationTestCase2<Camera2SurfaceViewActivity> {
+
+ private static final String TAG = "SurfaceViewTestCase";
+ private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
+ private static final int WAIT_FOR_SURFACE_CHANGE_TIMEOUT_MS = 1000;
+
+ // Instrumentation arguments
+ protected static final String ARG_KEY_REPEAT = "repeat";
+ protected static final String ARG_KEY_WAIT_INTERVAL_MS = "waitIntervalMs";
+ protected static final String ARG_KEY_RESULT_TO_FILE = "resultToFile";
+
+ // TODO: Use internal storage for this to make sure the file is only visible to test.
+ protected static final String DEBUG_FILE_NAME_BASE =
+ Environment.getExternalStorageDirectory().getPath();
+ protected static final int WAIT_FOR_RESULT_TIMEOUT_MS = 3000;
+ protected static final float FRAME_DURATION_ERROR_MARGIN = 0.005f; // 0.5 percent error margin.
+ protected static final int NUM_RESULTS_WAIT_TIMEOUT = 100;
+ protected static final int NUM_FRAMES_WAITED_FOR_UNKNOWN_LATENCY = 8;
+ protected static final int MIN_FRAME_DURATION_ERROR_MARGIN = 100; // ns
+
+ protected Context mContext;
+ protected CameraManager mCameraManager;
+ protected String[] mCameraIds;
+ protected HandlerThread mHandlerThread;
+ protected Handler mHandler;
+ protected BlockingStateCallback mCameraListener;
+ protected BlockingSessionCallback mSessionListener;
+ protected CameraErrorCollector mCollector;
+ // Per device fields:
+ protected StaticMetadata mStaticInfo;
+ protected CameraDevice mCamera;
+ protected CameraCaptureSession mSession;
+ protected ImageReader mReader;
+ protected Surface mReaderSurface;
+ protected Surface mPreviewSurface;
+ protected Size mPreviewSize;
+ protected List<Size> mOrderedPreviewSizes; // In descending order.
+ protected List<Size> mOrderedVideoSizes; // In descending order.
+ protected List<Size> mOrderedStillSizes; // In descending order.
+ protected HashMap<Size, Long> mMinPreviewFrameDurationMap;
+
+ protected WindowManager mWindowManager;
+
+ // Repeat tests a given times. Default to 1.
+ protected int mRepeat = 1;
+ // The interval between test iterations used for stress test.
+ protected long mTestWaitIntervalMs = 1 * 1000; // 1 sec
+ protected boolean mWriteToFile = true;
+ protected CameraTestResultPrinter mResultPrinter;
+
+
+ public Camera2SurfaceViewTestCase() {
+ super(Camera2SurfaceViewActivity.class);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ /**
+ * Set up the camera preview required environments, including activity,
+ * CameraManager, HandlerThread, Camera IDs, and CameraStateCallback.
+ */
+ super.setUp();
+ mContext = getActivity();
+ /**
+ * Workaround for mockito and JB-MR2 incompatibility
+ *
+ * Avoid java.lang.IllegalArgumentException: dexcache == null
+ * https://code.google.com/p/dexmaker/issues/detail?id=2
+ */
+ System.setProperty("dexmaker.dexcache", mContext.getCacheDir().toString());
+ mCameraManager = (CameraManager) mContext.getSystemService(Context.CAMERA_SERVICE);
+ assertNotNull("Unable to get CameraManager", mCameraManager);
+ mCameraIds = mCameraManager.getCameraIdList();
+ assertNotNull("Unable to get camera ids", mCameraIds);
+ mHandlerThread = new HandlerThread(TAG);
+ mHandlerThread.start();
+ mHandler = new Handler(mHandlerThread.getLooper());
+ mCameraListener = new BlockingStateCallback();
+ mCollector = new CameraErrorCollector();
+
+ mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
+
+ mRepeat = getArgumentsAsNumber(ARG_KEY_REPEAT, 1).intValue();
+ mTestWaitIntervalMs = getArgumentsAsNumber(ARG_KEY_WAIT_INTERVAL_MS, 1000).longValue();
+ mWriteToFile = getArgumentsAsBoolean(ARG_KEY_RESULT_TO_FILE, true);
+ Log.i(TAG, "Argument: repeat count=" + mRepeat);
+ Log.i(TAG, "Argument: interval (ms)=" + mTestWaitIntervalMs);
+ Log.i(TAG, "Argument: result to file=" + (mWriteToFile ? "true" : "false"));
+ mResultPrinter = new CameraTestResultPrinter(getInstrumentation(), mWriteToFile);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ // Teardown the camera preview required environments.
+ mHandlerThread.quitSafely();
+ mHandler = null;
+ mCameraListener = null;
+
+ try {
+ mCollector.verify();
+ } catch (Throwable e) {
+ // When new Exception(e) is used, exception info will be printed twice.
+ throw new Exception(e.getMessage());
+ } finally {
+ super.tearDown();
+ }
+ }
+
+ /**
+ * Start camera preview by using the given request, preview size and capture
+ * listener.
+ * <p>
+ * If preview is already started, calling this function will stop the
+ * current preview stream and start a new preview stream with given
+ * parameters. No need to call stopPreview between two startPreview calls.
+ * </p>
+ *
+ * @param request The request builder used to start the preview.
+ * @param previewSz The size of the camera device output preview stream.
+ * @param listener The callbacks the camera device will notify when preview
+ * capture is available.
+ */
+ protected void startPreview(CaptureRequest.Builder request, Size previewSz,
+ CaptureCallback listener) throws Exception {
+ // Update preview size.
+ updatePreviewSurface(previewSz);
+ if (VERBOSE) {
+ Log.v(TAG, "start preview with size " + mPreviewSize.toString());
+ }
+
+ configurePreviewOutput(request);
+
+ mSession.setRepeatingRequest(request.build(), listener, mHandler);
+ }
+
+ /**
+ * Configure the preview output stream.
+ *
+ * @param request The request to be configured with preview surface
+ */
+ protected void configurePreviewOutput(CaptureRequest.Builder request)
+ throws CameraAccessException {
+ List<Surface> outputSurfaces = new ArrayList<Surface>(/*capacity*/1);
+ outputSurfaces.add(mPreviewSurface);
+ mSessionListener = new BlockingSessionCallback();
+ mSession = configureCameraSession(mCamera, outputSurfaces, mSessionListener, mHandler);
+
+ request.addTarget(mPreviewSurface);
+ }
+
+ /**
+ * Create a {@link CaptureRequest#Builder} and add the default preview surface.
+ *
+ * @return The {@link CaptureRequest#Builder} to be created
+ * @throws CameraAccessException When create capture request from camera fails
+ */
+ protected CaptureRequest.Builder createRequestForPreview() throws CameraAccessException {
+ if (mPreviewSurface == null) {
+ throw new IllegalStateException(
+ "Preview surface is not set yet, call updatePreviewSurface or startPreview"
+ + "first to set the preview surface properly.");
+ }
+ CaptureRequest.Builder requestBuilder =
+ mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+ requestBuilder.addTarget(mPreviewSurface);
+ return requestBuilder;
+ }
+
+ /**
+ * Stop preview for current camera device.
+ */
+ protected void stopPreview() throws Exception {
+ if (VERBOSE) Log.v(TAG, "Stopping preview and waiting for idle");
+ // Stop repeat, wait for captures to complete, and disconnect from surfaces
+ mSession.close();
+ }
+
+ /**
+ * Setup still (JPEG) capture configuration and start preview.
+ * <p>
+ * The default max number of image is set to image reader.
+ * </p>
+ *
+ * @param previewRequest The capture request to be used for preview
+ * @param stillRequest The capture request to be used for still capture
+ * @param previewSz Preview size
+ * @param stillSz The still capture size
+ * @param resultListener Capture result listener
+ * @param imageListener The still capture image listener
+ */
+ protected void prepareStillCaptureAndStartPreview(CaptureRequest.Builder previewRequest,
+ CaptureRequest.Builder stillRequest, Size previewSz, Size stillSz,
+ CaptureCallback resultListener,
+ ImageReader.OnImageAvailableListener imageListener) throws Exception {
+ prepareCaptureAndStartPreview(previewRequest, stillRequest, previewSz, stillSz,
+ ImageFormat.JPEG, resultListener, MAX_READER_IMAGES, imageListener);
+ }
+
+ /**
+ * Setup still (JPEG) capture configuration and start preview.
+ *
+ * @param previewRequest The capture request to be used for preview
+ * @param stillRequest The capture request to be used for still capture
+ * @param previewSz Preview size
+ * @param stillSz The still capture size
+ * @param resultListener Capture result listener
+ * @param maxNumImages The max number of images set to the image reader
+ * @param imageListener The still capture image listener
+ */
+ protected void prepareStillCaptureAndStartPreview(CaptureRequest.Builder previewRequest,
+ CaptureRequest.Builder stillRequest, Size previewSz, Size stillSz,
+ CaptureCallback resultListener, int maxNumImages,
+ ImageReader.OnImageAvailableListener imageListener) throws Exception {
+ prepareCaptureAndStartPreview(previewRequest, stillRequest, previewSz, stillSz,
+ ImageFormat.JPEG, resultListener, maxNumImages, imageListener);
+ }
+
+ /**
+ * Setup raw capture configuration and start preview.
+ *
+ * <p>
+ * The default max number of image is set to image reader.
+ * </p>
+ *
+ * @param previewRequest The capture request to be used for preview
+ * @param rawRequest The capture request to be used for raw capture
+ * @param previewSz Preview size
+ * @param rawSz The raw capture size
+ * @param resultListener Capture result listener
+ * @param imageListener The raw capture image listener
+ */
+ protected void prepareRawCaptureAndStartPreview(CaptureRequest.Builder previewRequest,
+ CaptureRequest.Builder rawRequest, Size previewSz, Size rawSz,
+ CaptureCallback resultListener,
+ ImageReader.OnImageAvailableListener imageListener) throws Exception {
+ prepareCaptureAndStartPreview(previewRequest, rawRequest, previewSz, rawSz,
+ ImageFormat.RAW_SENSOR, resultListener, MAX_READER_IMAGES, imageListener);
+ }
+
+ /**
+ * Wait for expected result key value available in a certain number of results.
+ *
+ * <p>
+ * Check the result immediately if numFramesWait is 0.
+ * </p>
+ *
+ * @param listener The capture listener to get capture result
+ * @param resultKey The capture result key associated with the result value
+ * @param expectedValue The result value need to be waited for
+ * @param numResultsWait Number of frame to wait before times out
+ * @throws TimeoutRuntimeException If more than numResultsWait results are
+ * seen before the result matching myRequest arrives, or each individual wait
+ * for result times out after {@value #WAIT_FOR_RESULT_TIMEOUT_MS}ms.
+ */
+ protected static <T> void waitForResultValue(SimpleCaptureCallback listener,
+ CaptureResult.Key<T> resultKey,
+ T expectedValue, int numResultsWait) {
+ List<T> expectedValues = new ArrayList<T>();
+ expectedValues.add(expectedValue);
+ waitForAnyResultValue(listener, resultKey, expectedValues, numResultsWait);
+ }
+
+ /**
+ * Wait for any expected result key values available in a certain number of results.
+ *
+ * <p>
+ * Check the result immediately if numFramesWait is 0.
+ * </p>
+ *
+ * @param listener The capture listener to get capture result.
+ * @param resultKey The capture result key associated with the result value.
+ * @param expectedValues The list of result value need to be waited for,
+ * return immediately if the list is empty.
+ * @param numResultsWait Number of frame to wait before times out.
+ * @throws TimeoutRuntimeException If more than numResultsWait results are.
+ * seen before the result matching myRequest arrives, or each individual wait
+ * for result times out after {@value #WAIT_FOR_RESULT_TIMEOUT_MS}ms.
+ */
+ protected static <T> void waitForAnyResultValue(SimpleCaptureCallback listener,
+ CaptureResult.Key<T> resultKey,
+ List<T> expectedValues, int numResultsWait) {
+ if (numResultsWait < 0 || listener == null || expectedValues == null) {
+ throw new IllegalArgumentException(
+ "Input must be non-negative number and listener/expectedValues "
+ + "must be non-null");
+ }
+
+ int i = 0;
+ CaptureResult result;
+ do {
+ result = listener.getCaptureResult(WAIT_FOR_RESULT_TIMEOUT_MS);
+ T value = result.get(resultKey);
+ for ( T expectedValue : expectedValues) {
+ if (VERBOSE) {
+ Log.v(TAG, "Current result value for key " + resultKey.getName() + " is: "
+ + value.toString());
+ }
+ if (value.equals(expectedValue)) {
+ return;
+ }
+ }
+ } while (i++ < numResultsWait);
+
+ throw new TimeoutRuntimeException(
+ "Unable to get the expected result value " + expectedValues + " for key " +
+ resultKey.getName() + " after waiting for " + numResultsWait + " results");
+ }
+
+ /**
+ * Submit a capture once, then submit additional captures in order to ensure that
+ * the camera will be synchronized.
+ *
+ * <p>
+ * The additional capture count is determined by android.sync.maxLatency (or
+ * a fixed {@value #NUM_FRAMES_WAITED_FOR_UNKNOWN_LATENCY}) captures if maxLatency is unknown).
+ * </p>
+ *
+ * <p>Returns the number of captures that were submitted (at least 1), which is useful
+ * with {@link #waitForNumResults}.</p>
+ *
+ * @param request capture request to forward to {@link CameraDevice#capture}
+ * @param listener request listener to forward to {@link CameraDevice#capture}
+ * @param handler handler to forward to {@link CameraDevice#capture}
+ *
+ * @return the number of captures that were submitted
+ *
+ * @throws CameraAccessException if capturing failed
+ */
+ protected int captureRequestsSynchronized(
+ CaptureRequest request, CaptureCallback listener, Handler handler)
+ throws CameraAccessException {
+ return captureRequestsSynchronized(request, /*count*/1, listener, handler);
+ }
+
+ /**
+ * Submit a capture {@code count} times, then submit additional captures in order to ensure that
+ * the camera will be synchronized.
+ *
+ * <p>
+ * The additional capture count is determined by android.sync.maxLatency (or
+ * a fixed {@value #NUM_FRAMES_WAITED_FOR_UNKNOWN_LATENCY}) captures if maxLatency is unknown).
+ * </p>
+ *
+ * <p>Returns the number of captures that were submitted (at least 1), which is useful
+ * with {@link #waitForNumResults}.</p>
+ *
+ * @param request capture request to forward to {@link CameraDevice#capture}
+ * @param count the number of times to submit the request (minimally), must be at least 1
+ * @param listener request listener to forward to {@link CameraDevice#capture}
+ * @param handler handler to forward to {@link CameraDevice#capture}
+ *
+ * @return the number of captures that were submitted
+ *
+ * @throws IllegalArgumentException if {@code count} was not at least 1
+ * @throws CameraAccessException if capturing failed
+ */
+ protected int captureRequestsSynchronized(
+ CaptureRequest request, int count, CaptureCallback listener, Handler handler)
+ throws CameraAccessException {
+ if (count < 1) {
+ throw new IllegalArgumentException("count must be positive");
+ }
+
+ int maxLatency = mStaticInfo.getSyncMaxLatency();
+ if (maxLatency == CameraMetadata.SYNC_MAX_LATENCY_UNKNOWN) {
+ maxLatency = NUM_FRAMES_WAITED_FOR_UNKNOWN_LATENCY;
+ }
+
+ assertTrue("maxLatency is non-negative", maxLatency >= 0);
+
+ int numCaptures = maxLatency + count;
+
+ for (int i = 0; i < numCaptures; ++i) {
+ mSession.capture(request, listener, handler);
+ }
+
+ return numCaptures;
+ }
+
+ /**
+ * Wait for numResultWait frames
+ *
+ * @param resultListener The capture listener to get capture result back.
+ * @param numResultsWait Number of frame to wait
+ *
+ * @return the last result, or {@code null} if there was none
+ */
+ protected static CaptureResult waitForNumResults(SimpleCaptureCallback resultListener,
+ int numResultsWait) {
+ if (numResultsWait < 0 || resultListener == null) {
+ throw new IllegalArgumentException(
+ "Input must be positive number and listener must be non-null");
+ }
+
+ CaptureResult result = null;
+ for (int i = 0; i < numResultsWait; i++) {
+ result = resultListener.getCaptureResult(WAIT_FOR_RESULT_TIMEOUT_MS);
+ }
+
+ return result;
+ }
+
+ /**
+ * Wait for enough results for settings to be applied
+ *
+ * @param resultListener The capture listener to get capture result back.
+ * @param numResultWaitForUnknownLatency Number of frame to wait if camera device latency is
+ * unknown.
+ */
+ protected void waitForSettingsApplied(SimpleCaptureCallback resultListener,
+ int numResultWaitForUnknownLatency) {
+ int maxLatency = mStaticInfo.getSyncMaxLatency();
+ if (maxLatency == CameraMetadata.SYNC_MAX_LATENCY_UNKNOWN) {
+ maxLatency = numResultWaitForUnknownLatency;
+ }
+ // Wait for settings to take effect
+ waitForNumResults(resultListener, maxLatency);
+ }
+
+
+ /**
+ * Wait for AE to be stabilized before capture: CONVERGED or FLASH_REQUIRED.
+ *
+ * <p>Waits for {@code android.sync.maxLatency} number of results first, to make sure
+ * that the result is synchronized (or {@code numResultWaitForUnknownLatency} if the latency
+ * is unknown.</p>
+ *
+ * <p>This is a no-op for {@code LEGACY} devices since they don't report
+ * the {@code aeState} result.</p>
+ *
+ * @param resultListener The capture listener to get capture result back.
+ * @param numResultWaitForUnknownLatency Number of frame to wait if camera device latency is
+ * unknown.
+ */
+ protected void waitForAeStable(SimpleCaptureCallback resultListener,
+ int numResultWaitForUnknownLatency) {
+ waitForSettingsApplied(resultListener, numResultWaitForUnknownLatency);
+
+ if (!mStaticInfo.isHardwareLevelLimitedOrBetter()) {
+ // No-op for metadata
+ return;
+ }
+ List<Integer> expectedAeStates = new ArrayList<Integer>();
+ expectedAeStates.add(new Integer(CaptureResult.CONTROL_AE_STATE_CONVERGED));
+ expectedAeStates.add(new Integer(CaptureResult.CONTROL_AE_STATE_FLASH_REQUIRED));
+ waitForAnyResultValue(resultListener, CaptureResult.CONTROL_AE_STATE, expectedAeStates,
+ NUM_RESULTS_WAIT_TIMEOUT);
+ }
+
+ /**
+ * Wait for AE to be: LOCKED
+ *
+ * <p>Waits for {@code android.sync.maxLatency} number of results first, to make sure
+ * that the result is synchronized (or {@code numResultWaitForUnknownLatency} if the latency
+ * is unknown.</p>
+ *
+ * <p>This is a no-op for {@code LEGACY} devices since they don't report
+ * the {@code aeState} result.</p>
+ *
+ * @param resultListener The capture listener to get capture result back.
+ * @param numResultWaitForUnknownLatency Number of frame to wait if camera device latency is
+ * unknown.
+ */
+ protected void waitForAeLocked(SimpleCaptureCallback resultListener,
+ int numResultWaitForUnknownLatency) {
+
+ waitForSettingsApplied(resultListener, numResultWaitForUnknownLatency);
+
+ if (!mStaticInfo.isHardwareLevelLimitedOrBetter()) {
+ // No-op for legacy devices
+ return;
+ }
+
+ List<Integer> expectedAeStates = new ArrayList<Integer>();
+ expectedAeStates.add(new Integer(CaptureResult.CONTROL_AE_STATE_LOCKED));
+ waitForAnyResultValue(resultListener, CaptureResult.CONTROL_AE_STATE, expectedAeStates,
+ NUM_RESULTS_WAIT_TIMEOUT);
+ }
+
+ /**
+ * Create an {@link ImageReader} object and get the surface.
+ *
+ * @param size The size of this ImageReader to be created.
+ * @param format The format of this ImageReader to be created
+ * @param maxNumImages The max number of images that can be acquired simultaneously.
+ * @param listener The listener used by this ImageReader to notify callbacks.
+ */
+ protected void createImageReader(Size size, int format, int maxNumImages,
+ ImageReader.OnImageAvailableListener listener) throws Exception {
+ closeImageReader();
+
+ ImageReader r = makeImageReader(size, format, maxNumImages, listener,
+ mHandler);
+ mReader = r;
+ mReaderSurface = r.getSurface();
+ }
+
+ /**
+ * Close the pending images then close current active {@link ImageReader} object.
+ */
+ protected void closeImageReader() {
+ CameraTestUtils.closeImageReader(mReader);
+ mReader = null;
+ mReaderSurface = null;
+ }
+
+ /**
+ * Open a camera device and get the StaticMetadata for a given camera id.
+ *
+ * @param cameraId The id of the camera device to be opened.
+ */
+ protected void openDevice(String cameraId) throws Exception {
+ mCamera = CameraTestUtils.openCamera(
+ mCameraManager, cameraId, mCameraListener, mHandler);
+ mCollector.setCameraId(cameraId);
+ mStaticInfo = new StaticMetadata(mCameraManager.getCameraCharacteristics(cameraId),
+ CheckLevel.ASSERT, /*collector*/null);
+ if (mStaticInfo.isColorOutputSupported()) {
+ mOrderedPreviewSizes = getSupportedPreviewSizes(cameraId, mCameraManager,
+ getPreviewSizeBound(mWindowManager, PREVIEW_SIZE_BOUND));
+ mOrderedVideoSizes = getSupportedVideoSizes(cameraId, mCameraManager, PREVIEW_SIZE_BOUND);
+ mOrderedStillSizes = getSupportedStillSizes(cameraId, mCameraManager, null);
+ // Use ImageFormat.YUV_420_888 for now. TODO: need figure out what's format for preview
+ // in public API side.
+ mMinPreviewFrameDurationMap =
+ mStaticInfo.getAvailableMinFrameDurationsForFormatChecked(ImageFormat.YUV_420_888);
+ }
+ }
+
+ /**
+ * Close the current actively used camera device.
+ */
+ protected void closeDevice() {
+ if (mCamera != null) {
+ mCamera.close();
+ mCameraListener.waitForState(STATE_CLOSED, CAMERA_CLOSE_TIMEOUT_MS);
+ mCamera = null;
+ mSession = null;
+ mSessionListener = null;
+ mStaticInfo = null;
+ mOrderedPreviewSizes = null;
+ mOrderedVideoSizes = null;
+ mOrderedStillSizes = null;
+ }
+ }
+
+ /**
+ * Update the preview surface size.
+ *
+ * @param size The preview size to be updated.
+ */
+ protected void updatePreviewSurface(Size size) {
+ if (size.equals(mPreviewSize) && mPreviewSurface != null) {
+ Log.w(TAG, "Skipping update preview surface size...");
+ return;
+ }
+
+ mPreviewSize = size;
+ Camera2SurfaceViewActivity ctsActivity = getActivity();
+ final SurfaceHolder holder = ctsActivity.getSurfaceView().getHolder();
+ Handler handler = new Handler(Looper.getMainLooper());
+ handler.post(new Runnable() {
+ @Override
+ public void run() {
+ holder.setFixedSize(mPreviewSize.getWidth(), mPreviewSize.getHeight());
+ }
+ });
+
+ boolean res = ctsActivity.waitForSurfaceSizeChanged(
+ WAIT_FOR_SURFACE_CHANGE_TIMEOUT_MS, mPreviewSize.getWidth(),
+ mPreviewSize.getHeight());
+ assertTrue("wait for surface change to " + mPreviewSize.toString() + " timed out", res);
+ mPreviewSurface = holder.getSurface();
+ assertNotNull("Preview surface is null", mPreviewSurface);
+ assertTrue("Preview surface is invalid", mPreviewSurface.isValid());
+ }
+
+ /**
+ * Setup single capture configuration and start preview.
+ *
+ * @param previewRequest The capture request to be used for preview
+ * @param stillRequest The capture request to be used for still capture
+ * @param previewSz Preview size
+ * @param captureSz Still capture size
+ * @param format The single capture image format
+ * @param resultListener Capture result listener
+ * @param maxNumImages The max number of images set to the image reader
+ * @param imageListener The single capture capture image listener
+ */
+ protected void prepareCaptureAndStartPreview(CaptureRequest.Builder previewRequest,
+ CaptureRequest.Builder stillRequest, Size previewSz, Size captureSz, int format,
+ CaptureCallback resultListener, int maxNumImages,
+ ImageReader.OnImageAvailableListener imageListener) throws Exception {
+ if (VERBOSE) {
+ Log.v(TAG, String.format("Prepare single capture (%s) and preview (%s)",
+ captureSz.toString(), previewSz.toString()));
+ }
+
+ // Update preview size.
+ updatePreviewSurface(previewSz);
+
+ // Create ImageReader.
+ createImageReader(captureSz, format, maxNumImages, imageListener);
+
+ // Configure output streams with preview and jpeg streams.
+ List<Surface> outputSurfaces = new ArrayList<Surface>();
+ outputSurfaces.add(mPreviewSurface);
+ outputSurfaces.add(mReaderSurface);
+ mSessionListener = new BlockingSessionCallback();
+ mSession = configureCameraSession(mCamera, outputSurfaces, mSessionListener, mHandler);
+
+ // Configure the requests.
+ previewRequest.addTarget(mPreviewSurface);
+ stillRequest.addTarget(mPreviewSurface);
+ stillRequest.addTarget(mReaderSurface);
+
+ // Start preview.
+ mSession.setRepeatingRequest(previewRequest.build(), resultListener, mHandler);
+ }
+
+ /**
+ * Get the max preview size that supports the given fpsRange.
+ *
+ * @param fpsRange The fps range the returned size must support.
+ * @return max size that support the given fps range.
+ */
+ protected Size getMaxPreviewSizeForFpsRange(Range<Integer> fpsRange) {
+ if (fpsRange == null || fpsRange.getLower() <= 0 || fpsRange.getUpper() <= 0) {
+ throw new IllegalArgumentException("Invalid fps range argument");
+ }
+ if (mOrderedPreviewSizes == null || mMinPreviewFrameDurationMap == null) {
+ throw new IllegalStateException("mOrderedPreviewSizes and mMinPreviewFrameDurationMap"
+ + " must be initialized");
+ }
+
+ long[] frameDurationRange =
+ new long[]{(long) (1e9 / fpsRange.getUpper()), (long) (1e9 / fpsRange.getLower())};
+ for (Size size : mOrderedPreviewSizes) {
+ Long minDuration = mMinPreviewFrameDurationMap.get(size);
+ if (minDuration == null ||
+ minDuration == 0) {
+ if (mStaticInfo.isCapabilitySupported(
+ CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR)) {
+ throw new IllegalArgumentException(
+ "No min frame duration available for the size " + size);
+ }
+ continue;
+ }
+ if (minDuration <= (frameDurationRange[0] + MIN_FRAME_DURATION_ERROR_MARGIN)) {
+ return size;
+ }
+ }
+
+ return null;
+ }
+
+ protected boolean isReprocessSupported(String cameraId, int format)
+ throws CameraAccessException {
+ if (format != ImageFormat.YUV_420_888 && format != ImageFormat.PRIVATE) {
+ throw new IllegalArgumentException(
+ "format " + format + " is not supported for reprocessing");
+ }
+
+ StaticMetadata info =
+ new StaticMetadata(mCameraManager.getCameraCharacteristics(cameraId),
+ CheckLevel.ASSERT, /*collector*/ null);
+ int cap = CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_YUV_REPROCESSING;
+ if (format == ImageFormat.PRIVATE) {
+ cap = CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_PRIVATE_REPROCESSING;
+ }
+ return info.isCapabilitySupported(cap);
+ }
+
+ //--------------------------------------------------------------------------------
+ //---------Below are common functions for Camera framework test run.--------------
+ //--------------------------------------------------------------------------------
+
+ protected Bundle getArguments() {
+ return ((InstrumentationTestRunner)getInstrumentation()).getArguments();
+ }
+
+ protected <E extends Number> Number getArgumentsAsNumber(String key, E defaultValue) {
+ String stringValue = getArguments().getString(key);
+ if (stringValue != null) {
+ try {
+ return NumberFormat.getInstance().parse(stringValue);
+ } catch (ParseException e) {
+ Log.w(TAG, "Unable to parse arg " + key + " with value " + stringValue
+ + " to a integer.", e);
+ }
+ }
+ return defaultValue;
+ }
+
+ protected boolean getArgumentsAsBoolean(String key, boolean defaultValue) {
+ String stringValue = getArguments().getString(key);
+ if (stringValue != null) {
+ try {
+ return Boolean.parseBoolean(stringValue);
+ } catch (Exception e) {
+ Log.w(TAG, "Unable to parse arg " + key + " with value " + stringValue
+ + " to a boolean.", e);
+ }
+ }
+ return defaultValue;
+ }
+
+ protected int getRepeatCount() {
+ return mRepeat;
+ }
+
+ protected long getTestWaitIntervalMs() {
+ return mTestWaitIntervalMs;
+ }
+
+ public CameraTestResultPrinter getResultPrinter() {
+ return mResultPrinter;
+ }
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/CameraStressTestRunner.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/CameraStressTestRunner.java
index 23b9705..ddc5ded 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/CameraStressTestRunner.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/CameraStressTestRunner.java
@@ -18,6 +18,7 @@
import android.test.InstrumentationTestRunner;
import android.test.InstrumentationTestSuite;
+
import com.android.mediaframeworktest.stress.CameraStressTest;
import com.android.mediaframeworktest.functional.camera.CameraFunctionalTest;
import com.android.mediaframeworktest.functional.camera.CameraPairwiseTest;
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/camera/CameraFunctionalTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/camera/CameraFunctionalTest.java
index d12ef2e..9c08d48 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/camera/CameraFunctionalTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/camera/CameraFunctionalTest.java
@@ -17,31 +17,20 @@
package com.android.mediaframeworktest.functional.camera;
import com.android.mediaframeworktest.MediaFrameworkTest;
-import com.android.mediaframeworktest.CameraTestHelper;
+import com.android.mediaframeworktest.helpers.CameraTestHelper;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
import java.io.Writer;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import android.hardware.Camera;
import android.hardware.Camera.Parameters;
-import android.os.Environment;
import android.os.Handler;
import android.os.Looper;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.LargeTest;
import android.util.Log;
import android.view.SurfaceHolder;
-import com.android.mediaframeworktest.CameraStressTestRunner;
-
-import junit.framework.Assert;
/**
* Junit / Instrumentation test case for the following camera APIs:
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/camera/CameraPairwiseTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/camera/CameraPairwiseTest.java
index 8f67598..f9d4964 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/camera/CameraPairwiseTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/camera/CameraPairwiseTest.java
@@ -17,9 +17,6 @@
package com.android.mediaframeworktest.functional.camera;
import android.hardware.Camera;
-import android.hardware.Camera.PictureCallback;
-import android.hardware.Camera.ShutterCallback;
-import android.os.Environment;
import android.os.Handler;
import android.os.Looper;
import android.test.ActivityInstrumentationTestCase2;
@@ -32,9 +29,7 @@
import java.util.List;
import com.android.mediaframeworktest.MediaFrameworkTest;
-import com.android.mediaframeworktest.CameraStressTestRunner;
-import com.android.mediaframeworktest.CameraTestHelper;
-import junit.framework.Assert;
+import com.android.mediaframeworktest.helpers.CameraTestHelper;
/**
* Junit / Instrumentation test case for camera API pairwise testing
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/AssertHelpers.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/AssertHelpers.java
new file mode 100644
index 0000000..e7b4275
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/AssertHelpers.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mediaframeworktest.helpers;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
+
+/**
+ * Helper set of methods to add extra useful assert functionality missing in junit.
+ */
+/**
+ * (non-Javadoc)
+ * @see android.hardware.camera2.cts.helpers.AssertHelpers
+ */
+public class AssertHelpers {
+
+ private static final int MAX_FORMAT_STRING = 50;
+
+ /**
+ * Assert that at least one of the elements in data is non-zero.
+ *
+ * <p>An empty or a null array always fails.</p>
+ */
+ public static void assertArrayNotAllZeroes(String message, byte[] data) {
+ int size = data.length;
+
+ int i = 0;
+ for (i = 0; i < size; ++i) {
+ if (data[i] != 0) {
+ break;
+ }
+ }
+
+ assertTrue(message, i < size);
+ }
+
+ /**
+ * Assert that every element in left is less than or equals to the corresponding element in
+ * right.
+ *
+ * <p>Array sizes must match.</p>
+ *
+ * @param message Message to use in case the assertion fails
+ * @param left Left array
+ * @param right Right array
+ */
+ public static void assertArrayNotGreater(String message, float[] left, float[] right) {
+ assertEquals("Array lengths did not match", left.length, right.length);
+
+ String leftString = Arrays.toString(left);
+ String rightString = Arrays.toString(right);
+
+ for (int i = 0; i < left.length; ++i) {
+ String msg = String.format(
+ "%s: (%s should be less than or equals than %s; item index %d; left = %s; " +
+ "right = %s)",
+ message, left[i], right[i], i, leftString, rightString);
+
+ assertTrue(msg, left[i] <= right[i]);
+ }
+ }
+
+ /**
+ * Assert that every element in the value array is greater than the lower bound (exclusive).
+ *
+ * @param value an array of items
+ * @param lowerBound the exclusive lower bound
+ */
+ public static void assertArrayWithinLowerBound(String message, float[] value, float lowerBound)
+ {
+ for (int i = 0; i < value.length; ++i) {
+ assertTrue(
+ String.format("%s: (%s should be greater than than %s; item index %d in %s)",
+ message, value[i], lowerBound, i, Arrays.toString(value)),
+ value[i] > lowerBound);
+ }
+ }
+
+ /**
+ * Assert that every element in the value array is less than the upper bound (exclusive).
+ *
+ * @param value an array of items
+ * @param upperBound the exclusive upper bound
+ */
+ public static void assertArrayWithinUpperBound(String message, float[] value, float upperBound)
+ {
+ for (int i = 0; i < value.length; ++i) {
+ assertTrue(
+ String.format("%s: (%s should be less than than %s; item index %d in %s)",
+ message, value[i], upperBound, i, Arrays.toString(value)),
+ value[i] < upperBound);
+ }
+ }
+
+ /**
+ * Assert that {@code low <= value <= high}
+ */
+ public static void assertInRange(float value, float low, float high) {
+ assertTrue(
+ String.format("Value %s must be greater or equal to %s, but was lower", value, low),
+ value >= low);
+ assertTrue(
+ String.format("Value %s must be less than or equal to %s, but was higher",
+ value, high),
+ value <= high);
+
+ // TODO: generic by using comparators
+ }
+
+ /**
+ * Assert that the given array contains the given value.
+ *
+ * @param message message to print on failure.
+ * @param actual array to test.
+ * @param checkVals value to check for array membership.
+ */
+ public static <T> void assertArrayContains(String message, T[] actual, T checkVals) {
+ assertCollectionContainsAnyOf(message, buildList(actual), Arrays.asList(checkVals));
+ }
+
+
+ /**
+ * Assert that the given array contains the given value.
+ *
+ * @param message message to print on failure.
+ * @param actual array to test.
+ * @param checkVals value to check for array membership.
+ */
+ public static void assertArrayContains(String message, int[] actual, int checkVals) {
+ assertCollectionContainsAnyOf(message, buildList(actual), Arrays.asList(checkVals));
+ }
+
+ /**
+ * Assert that the given array contains at least one of the given values.
+ *
+ * @param message message to print on failure.
+ * @param actual array to test
+ * @param checkVals values to check for array membership.
+ * @return the value contained, or null.
+ */
+ public static <T> T assertArrayContainsAnyOf(String message, T[] actual, T[] checkVals) {
+ return assertCollectionContainsAnyOf(message, buildList(actual), buildList(checkVals));
+ }
+
+ /**
+ * Assert that the given array contains at least one of the given values.
+ *
+ * @param message message to print on failure.
+ * @param actual array to test
+ * @param checkVals values to check for array membership.
+ * @return the value contained.
+ */
+ public static int assertArrayContainsAnyOf(String message, int[] actual, int[] checkVals) {
+ return assertCollectionContainsAnyOf(message, buildList(actual), buildList(checkVals));
+ }
+
+ /**
+ * Assert that the given {@link Collection} contains at least one of the given values.
+ *
+ * @param message message to print on failure.
+ * @param actual {@link Collection} to test.
+ * @param checkVals a {@link Collection} of values to check for membership.
+ * @return the value contained, or null.
+ */
+ public static <T> T assertCollectionContainsAnyOf(String message, Collection<T> actual,
+ Collection<T> checkVals) {
+ boolean contains = false;
+ T selected = null;
+ for (T check : checkVals) {
+ contains = actual.contains(check);
+ if (contains) {
+ selected = check;
+ break;
+ }
+ }
+
+ if (!contains) {
+ fail(String.format("%s : No elements from %s in %s", message,
+ formatCollection(actual, MAX_FORMAT_STRING),
+ formatCollection(checkVals, MAX_FORMAT_STRING)));
+ }
+ return selected;
+ }
+
+ private static <T> List<T> buildList(T[] array) {
+ return new ArrayList<T>(Arrays.asList(array));
+ }
+
+ private static List<Integer> buildList(int[] array) {
+ List<Integer> list = new ArrayList<Integer>(array.length);
+ for (Integer val : array) {
+ list.add(val);
+ }
+ return list;
+ }
+
+ private static <T> String formatCollection(Collection<T> collection, int maxLen) {
+ StringBuilder builder = new StringBuilder();
+ builder.append("[");
+
+ boolean first = true;
+ for (T elem : collection) {
+ String val = ((first) ? ", " : "") + ((elem != null) ? elem.toString() : "null");
+ first = false;
+ if ((builder.length() + val.length()) > maxLen - "...]".length()) {
+ builder.append("...");
+ break;
+ } else {
+ builder.append(val);
+ }
+ }
+ builder.append("]");
+ return builder.toString();
+ }
+
+
+ // Suppress default constructor for noninstantiability
+ private AssertHelpers() { throw new AssertionError(); }
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/Camera2Focuser.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/Camera2Focuser.java
new file mode 100644
index 0000000..3f792e0
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/Camera2Focuser.java
@@ -0,0 +1,395 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mediaframeworktest.helpers;
+
+import com.android.ex.camera2.pos.AutoFocusStateMachine;
+import com.android.ex.camera2.pos.AutoFocusStateMachine.AutoFocusStateListener;
+
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraCaptureSession;
+import android.hardware.camera2.CameraCaptureSession.CaptureCallback;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.hardware.camera2.TotalCaptureResult;
+import android.hardware.camera2.params.MeteringRectangle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.Surface;
+
+/**
+ * A focuser utility class to assist camera to do auto focus.
+ * <p>
+ * This class need create repeating request and single request to do auto focus.
+ * The repeating request is used to get the auto focus states; the single
+ * request is used to trigger the auto focus. This class assumes the camera device
+ * supports auto-focus. Don't use this class if the camera device doesn't have focuser
+ * unit.
+ * </p>
+ */
+/**
+ * (non-Javadoc)
+ * @see android.hardware.camera2.cts.helpers.Camera2Focuser
+ */
+public class Camera2Focuser implements AutoFocusStateListener {
+ private static final String TAG = "Focuser";
+ private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
+
+ private final AutoFocusStateMachine mAutoFocus = new AutoFocusStateMachine(this);
+ private final Handler mHandler;
+ private final AutoFocusListener mAutoFocusListener;
+ private final CameraDevice mCamera;
+ private final CameraCaptureSession mSession;
+ private final Surface mRequestSurface;
+ private final StaticMetadata mStaticInfo;
+
+ private int mAfRun = 0;
+ private MeteringRectangle[] mAfRegions;
+ private boolean mLocked = false;
+ private boolean mSuccess = false;
+ private CaptureRequest.Builder mRepeatingBuilder;
+
+ /**
+ * The callback interface to notify auto focus result.
+ */
+ public interface AutoFocusListener {
+ /**
+ * This callback is called when auto focus completes and locked.
+ *
+ * @param success true if focus was successful, false if otherwise
+ */
+ void onAutoFocusLocked(boolean success);
+ }
+
+ /**
+ * Construct a focuser object, with given capture requestSurface, listener
+ * and handler.
+ * <p>
+ * The focuser object will use camera and requestSurface to submit capture
+ * request and receive focus state changes. The {@link AutoFocusListener} is
+ * used to notify the auto focus callback.
+ * </p>
+ *
+ * @param camera The camera device associated with this focuser
+ * @param session The camera capture session associated with this focuser
+ * @param requestSurface The surface to issue the capture request with
+ * @param listener The auto focus listener to notify AF result
+ * @param staticInfo The CameraCharacteristics of the camera device
+ * @param handler The handler used to post auto focus callbacks
+ * @throws CameraAccessException
+ */
+ public Camera2Focuser(CameraDevice camera, CameraCaptureSession session, Surface requestSurface,
+ AutoFocusListener listener, CameraCharacteristics staticInfo, Handler handler)
+ throws CameraAccessException {
+ if (camera == null) {
+ throw new IllegalArgumentException("camera must not be null");
+ }
+ if (session == null) {
+ throw new IllegalArgumentException("session must not be null");
+ }
+ if (listener == null) {
+ throw new IllegalArgumentException("listener must not be null");
+ }
+ if (handler == null) {
+ throw new IllegalArgumentException("handler must not be null");
+ }
+ if (requestSurface == null) {
+ throw new IllegalArgumentException("requestSurface must not be null");
+ }
+ if (staticInfo == null) {
+ throw new IllegalArgumentException("staticInfo must not be null");
+ }
+
+ mCamera = camera;
+ mSession = session;
+ mRequestSurface = requestSurface;
+ mAutoFocusListener = listener;
+ mStaticInfo = new StaticMetadata(staticInfo,
+ StaticMetadata.CheckLevel.ASSERT, /*collector*/null);
+ mHandler = handler;
+
+ if (!mStaticInfo.hasFocuser()) {
+ throw new IllegalArgumentException("this camera doesn't have a focuser");
+ }
+
+ /**
+ * Begin by always being in passive auto focus.
+ */
+ cancelAutoFocus();
+ }
+
+ @Override
+ public synchronized void onAutoFocusSuccess(CaptureResult result, boolean locked) {
+ mSuccess = true;
+ mLocked = locked;
+
+ if (locked) {
+ dispatchAutoFocusStatusLocked(/*success*/true);
+ }
+ }
+
+ @Override
+ public synchronized void onAutoFocusFail(CaptureResult result, boolean locked) {
+ mSuccess = false;
+ mLocked = locked;
+
+ if (locked) {
+ dispatchAutoFocusStatusLocked(/*success*/false);
+ }
+ }
+
+ @Override
+ public synchronized void onAutoFocusScan(CaptureResult result) {
+ mSuccess = false;
+ mLocked = false;
+ }
+
+ @Override
+ public synchronized void onAutoFocusInactive(CaptureResult result) {
+ mSuccess = false;
+ mLocked = false;
+ }
+
+ /**
+ * Start a active auto focus scan based on the given regions.
+ *
+ * <p>This is usually used for touch for focus, it can make the auto-focus converge based
+ * on some particular region aggressively. But it is usually slow as a full active scan
+ * is initiated. After the auto focus is converged, the {@link cancelAutoFocus} must be called
+ * to resume the continuous auto-focus.</p>
+ *
+ * @param afRegions The AF regions used by focuser auto focus, full active
+ * array size is used if afRegions is null.
+ * @throws CameraAccessException
+ */
+ public synchronized void touchForAutoFocus(MeteringRectangle[] afRegions)
+ throws CameraAccessException {
+ startAutoFocusLocked(/*active*/true, afRegions);
+ }
+
+ /**
+ * Start auto focus scan.
+ * <p>
+ * Start an auto focus scan if it was not done yet. If AF passively focused,
+ * lock it. If AF is already locked, return. Otherwise, initiate a full
+ * active scan. This is suitable for still capture: focus should need to be
+ * accurate, but the AF latency also need to be as short as possible.
+ * </p>
+ *
+ * @param afRegions The AF regions used by focuser auto focus, full active
+ * array size is used if afRegions is null.
+ * @throws CameraAccessException
+ */
+ public synchronized void startAutoFocus(MeteringRectangle[] afRegions)
+ throws CameraAccessException {
+ startAutoFocusLocked(/*forceActive*/false, afRegions);
+ }
+
+ /**
+ * Cancel ongoing auto focus, unlock the auto-focus if it was locked, and
+ * resume to passive continuous auto focus.
+ *
+ * @throws CameraAccessException
+ */
+ public synchronized void cancelAutoFocus() throws CameraAccessException {
+ mSuccess = false;
+ mLocked = false;
+
+ // reset the AF regions:
+ setAfRegions(null);
+
+ // Create request builders, the af regions are automatically updated.
+ mRepeatingBuilder = createRequestBuilder();
+ CaptureRequest.Builder requestBuilder = createRequestBuilder();
+ mAutoFocus.setPassiveAutoFocus(/*picture*/true, mRepeatingBuilder);
+ mAutoFocus.unlockAutoFocus(mRepeatingBuilder, requestBuilder);
+ CaptureCallback listener = createCaptureListener();
+ mSession.setRepeatingRequest(mRepeatingBuilder.build(), listener, mHandler);
+ mSession.capture(requestBuilder.build(), listener, mHandler);
+ }
+
+ /**
+ * Get current AF mode.
+ * @return current AF mode
+ * @throws IllegalStateException if there auto focus is not running.
+ */
+ public synchronized int getCurrentAfMode() {
+ if (mRepeatingBuilder == null) {
+ throw new IllegalStateException("Auto focus is not running, unable to get AF mode");
+ }
+
+ return mRepeatingBuilder.get(CaptureRequest.CONTROL_AF_MODE);
+ }
+
+ private void startAutoFocusLocked(
+ boolean forceActive, MeteringRectangle[] afRegions) throws CameraAccessException {
+
+ setAfRegions(afRegions);
+ mAfRun++;
+
+ // Create request builders, the af regions are automatically updated.
+ mRepeatingBuilder = createRequestBuilder();
+ CaptureRequest.Builder requestBuilder = createRequestBuilder();
+ if (forceActive) {
+ startAutoFocusFullActiveLocked();
+ } else {
+ // Not forcing a full active scan. If AF passively focused, lock it. If AF is already
+ // locked, return. Otherwise, initiate a full active scan.
+ if (mSuccess && mLocked) {
+ dispatchAutoFocusStatusLocked(/*success*/true);
+ return;
+ } else if (mSuccess) {
+ mAutoFocus.lockAutoFocus(mRepeatingBuilder, requestBuilder);
+ CaptureCallback listener = createCaptureListener();
+ mSession.setRepeatingRequest(mRepeatingBuilder.build(), listener, mHandler);
+ mSession.capture(requestBuilder.build(), listener, mHandler);
+ } else {
+ startAutoFocusFullActiveLocked();
+ }
+ }
+ }
+
+ private void startAutoFocusFullActiveLocked() throws CameraAccessException {
+ // Create request builders, the af regions are automatically updated.
+ mRepeatingBuilder = createRequestBuilder();
+ CaptureRequest.Builder requestBuilder = createRequestBuilder();
+ mAutoFocus.setActiveAutoFocus(mRepeatingBuilder, requestBuilder);
+ if (mRepeatingBuilder.get(CaptureRequest.CONTROL_AF_TRIGGER)
+ != CaptureRequest.CONTROL_AF_TRIGGER_IDLE) {
+ throw new AssertionError("Wrong trigger set in repeating request");
+ }
+ if (requestBuilder.get(CaptureRequest.CONTROL_AF_TRIGGER)
+ != CaptureRequest.CONTROL_AF_TRIGGER_START) {
+ throw new AssertionError("Wrong trigger set in queued request");
+ }
+ mAutoFocus.resetState();
+
+ CaptureCallback listener = createCaptureListener();
+ mSession.setRepeatingRequest(mRepeatingBuilder.build(), listener, mHandler);
+ mSession.capture(requestBuilder.build(), listener, mHandler);
+ }
+
+ private void dispatchAutoFocusStatusLocked(final boolean success) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mAutoFocusListener.onAutoFocusLocked(success);
+ }
+ });
+ }
+
+ /**
+ * Create request builder, set the af regions.
+ * @throws CameraAccessException
+ */
+ private CaptureRequest.Builder createRequestBuilder() throws CameraAccessException {
+ CaptureRequest.Builder requestBuilder =
+ mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+
+ requestBuilder.set(CaptureRequest.CONTROL_AF_REGIONS, mAfRegions);
+ requestBuilder.addTarget(mRequestSurface);
+
+ return requestBuilder;
+ }
+
+ /**
+ * Set AF regions, fall back to default region if afRegions is null.
+ *
+ * @param afRegions The AF regions to set
+ * @throws IllegalArgumentException if the region is malformed (length is 0).
+ */
+ private void setAfRegions(MeteringRectangle[] afRegions) {
+ if (afRegions == null) {
+ setDefaultAfRegions();
+ return;
+ }
+ // Throw IAE if AF regions are malformed.
+ if (afRegions.length == 0) {
+ throw new IllegalArgumentException("afRegions is malformed, length: 0");
+ }
+
+ mAfRegions = afRegions;
+ }
+
+ /**
+ * Set default AF region to full active array size.
+ */
+ private void setDefaultAfRegions() {
+ // Initialize AF regions with all zeros, meaning that it is up to camera device to device
+ // the regions used by AF.
+ mAfRegions = new MeteringRectangle[] {
+ new MeteringRectangle(0, 0, 0, 0, MeteringRectangle.METERING_WEIGHT_DONT_CARE)};
+ }
+ private CaptureCallback createCaptureListener() {
+
+ int thisAfRun;
+ synchronized (this) {
+ thisAfRun = mAfRun;
+ }
+
+ final int finalAfRun = thisAfRun;
+
+ return new CaptureCallback() {
+ private long mLatestFrameCount = -1;
+
+ @Override
+ public void onCaptureProgressed(CameraCaptureSession session, CaptureRequest request,
+ CaptureResult result) {
+ // In case of a partial result, send to focuser if necessary
+ // 3A fields are present
+ if (result.get(CaptureResult.CONTROL_AF_STATE) != null &&
+ result.get(CaptureResult.CONTROL_AF_MODE) != null) {
+ if (VERBOSE) {
+ Log.v(TAG, "Focuser - got early AF state");
+ }
+
+ dispatchToFocuser(result);
+ }
+ }
+
+ @Override
+ public void onCaptureCompleted(CameraCaptureSession session, CaptureRequest request,
+ TotalCaptureResult result) {
+ dispatchToFocuser(result);
+ }
+
+ private void dispatchToFocuser(CaptureResult result) {
+ int afRun;
+ synchronized (Camera2Focuser.this) {
+ // In case of partial results, don't send AF update twice
+ long frameCount = result.getFrameNumber();
+ if (frameCount <= mLatestFrameCount) return;
+ mLatestFrameCount = frameCount;
+
+ afRun = mAfRun;
+ }
+
+ if (afRun != finalAfRun) {
+ if (VERBOSE) {
+ Log.w(TAG,
+ "onCaptureCompleted - Ignoring results from previous AF run "
+ + finalAfRun);
+ }
+ return;
+ }
+
+ mAutoFocus.onCaptureCompleted(result);
+ }
+ };
+ }
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraErrorCollector.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraErrorCollector.java
new file mode 100644
index 0000000..6facec4
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraErrorCollector.java
@@ -0,0 +1,1066 @@
+/*
+ * Copyright 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mediaframeworktest.helpers;
+
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.Matcher;
+import org.junit.rules.ErrorCollector;
+
+import android.graphics.Rect;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureRequest.Builder;
+import android.hardware.camera2.CaptureResult;
+import android.hardware.camera2.params.MeteringRectangle;
+import android.media.Image;
+import android.util.Log;
+import android.util.Size;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * A camera test ErrorCollector class to gather the test failures during a test,
+ * instead of failing the test immediately for each failure.
+ */
+/**
+ * (non-Javadoc)
+ * @see android.hardware.camera2.cts.helpers.CameraErrorCollector
+ */
+public class CameraErrorCollector extends ErrorCollector {
+
+ private static final String TAG = "CameraErrorCollector";
+ private static final boolean LOG_ERRORS = Log.isLoggable(TAG, Log.ERROR);
+
+ private String mCameraMsg = "";
+
+ @Override
+ public void verify() throws Throwable {
+ // Do not remove if using JUnit 3 test runners. super.verify() is protected.
+ super.verify();
+ }
+
+ /**
+ * Adds an unconditional error to the table.
+ *
+ * <p>Execution continues, but test will fail at the end.</p>
+ *
+ * @param message A string containing the failure reason.
+ */
+ public void addMessage(String message) {
+ addErrorSuper(new Throwable(mCameraMsg + message));
+ }
+
+ /**
+ * Adds a Throwable to the table. <p>Execution continues, but the test will fail at the end.</p>
+ */
+ @Override
+ public void addError(Throwable error) {
+ addErrorSuper(new Throwable(mCameraMsg + error.getMessage(), error));
+ }
+
+ private void addErrorSuper(Throwable error) {
+ if (LOG_ERRORS) Log.e(TAG, error.getMessage());
+ super.addError(error);
+ }
+
+ /**
+ * Adds a failure to the table if {@code matcher} does not match {@code value}.
+ * Execution continues, but the test will fail at the end if the match fails.
+ * The camera id is included into the failure log.
+ */
+ @Override
+ public <T> void checkThat(final T value, final Matcher<T> matcher) {
+ super.checkThat(mCameraMsg, value, matcher);
+ }
+
+ /**
+ * Adds a failure with the given {@code reason} to the table if
+ * {@code matcher} does not match {@code value}. Execution continues, but
+ * the test will fail at the end if the match fails. The camera id is
+ * included into the failure log.
+ */
+ @Override
+ public <T> void checkThat(final String reason, final T value, final Matcher<T> matcher) {
+ super.checkThat(mCameraMsg + reason, value, matcher);
+ }
+
+ /**
+ * Set the camera id to this error collector object for logging purpose.
+ *
+ * @param id The camera id to be set.
+ */
+ public void setCameraId(String id) {
+ if (id != null) {
+ mCameraMsg = "Test failed for camera " + id + ": ";
+ } else {
+ mCameraMsg = "";
+ }
+ }
+
+ /**
+ * Adds a failure to the table if {@code condition} is not {@code true}.
+ * <p>
+ * Execution continues, but the test will fail at the end if the condition
+ * failed.
+ * </p>
+ *
+ * @param msg Message to be logged when check fails.
+ * @param condition Log the failure if it is not true.
+ */
+ public boolean expectTrue(String msg, boolean condition) {
+ if (!condition) {
+ addMessage(msg);
+ }
+
+ return condition;
+ }
+
+ /**
+ * Check if the two values are equal.
+ *
+ * @param msg Message to be logged when check fails.
+ * @param expected Expected value to be checked against.
+ * @param actual Actual value to be checked.
+ * @return {@code true} if the two values are equal, {@code false} otherwise.
+ *
+ * @throws IllegalArgumentException if {@code expected} was {@code null}
+ */
+ public <T> boolean expectEquals(String msg, T expected, T actual) {
+ if (expected == null) {
+ throw new IllegalArgumentException("expected value shouldn't be null");
+ }
+
+ if (!Objects.equals(expected, actual)) {
+ addMessage(String.format("%s (expected = %s, actual = %s) ", msg, expected,
+ actual));
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Check if the two values are not equal.
+ *
+ * @param msg Message to be logged when check fails.
+ * @param expected Expected value to be checked against.
+ * @param actual Actual value to be checked.
+ * @return {@code true} if the two values are not equal, {@code false} otherwise.
+ */
+ public <T> boolean expectNotEquals(String msg, T expected, T actual) {
+ if (Objects.equals(expected, actual)) {
+ addMessage(String.format("%s (expected = %s, actual = %s) ", msg, expected,
+ actual));
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Check if the two arrays of values are deeply equal.
+ *
+ * @param msg Message to be logged when check fails.
+ * @param expected Expected array of values to be checked against.
+ * @param actual Actual array of values to be checked.
+ * @return {@code true} if the two arrays of values are deeply equal, {@code false} otherwise.
+ *
+ * @throws IllegalArgumentException if {@code expected} was {@code null}
+ */
+ public <T> boolean expectEquals(String msg, T[] expected, T[] actual) {
+ if (expected == null) {
+ throw new IllegalArgumentException("expected value shouldn't be null");
+ }
+
+ if (!Arrays.deepEquals(expected, actual)) {
+ addMessage(String.format("%s (expected = %s, actual = %s) ", msg,
+ Arrays.deepToString(expected), Arrays.deepToString(actual)));
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Check if the two arrays of values are not deeply equal.
+ *
+ * @param msg Message to be logged when check fails.
+ * @param expected Expected array of values to be checked against.
+ * @param actual Actual array of values to be checked.
+ * @return {@code true} if the two arrays of values are not deeply equal, {@code false}
+ * otherwise.
+ *
+ * @throws IllegalArgumentException if {@code expected} was {@code null}
+ */
+ public <T> boolean expectNotEquals(String msg, T[] expected, T[] actual) {
+ if (expected == null) {
+ throw new IllegalArgumentException("expected value shouldn't be null");
+ }
+
+ if (Arrays.deepEquals(expected, actual)) {
+ addMessage(String.format("%s (expected = %s, actual = %s) ", msg,
+ Arrays.deepToString(expected), Arrays.deepToString(actual)));
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Check that the {@code actual} value is greater than the {@code expected} value.
+ *
+ * @param msg Message to be logged when check fails.
+ * @param expected The expected value to check that the actual value is larger than.
+ * @param actual Actual value to check.
+ * @return {@code true} if {@code actual} is greater than {@code expected}.
+ */
+ public <T extends Comparable<? super T>> boolean expectGreater(String msg, T expected,
+ T actual) {
+ return expectTrue(String.format("%s: (expected = %s was not greater than actual = %s) ",
+ msg, expected, actual), actual.compareTo(expected) > 0);
+ }
+
+ /**
+ * Check that the {@code actual} value is greater than or equal to the {@code expected} value.
+ *
+ * @param msg Message to be logged when check fails.
+ * @param expected The expected value to check that the actual value is larger than or equal to.
+ * @param actual Actual value to check.
+ * @return {@code true} if {@code actual} is greater than or equal to {@code expected}.
+ */
+ public <T extends Comparable<? super T>> boolean expectGreaterOrEqual(String msg, T expected,
+ T actual) {
+ return expectTrue(String.format("%s: (expected = %s was not greater than actual = %s) ",
+ msg, expected, actual), actual.compareTo(expected) >= 0);
+ }
+
+ /**
+ * Check that the {@code actual} value is less than the {@code expected} value.
+ *
+ * @param msg Message to be logged when check fails.
+ * @param expected The expected value to check that the actual value is less than.
+ * @param actual Actual value to check.
+ * @return {@code true} if {@code actual} is less than {@code expected}.
+ */
+ public <T extends Comparable<? super T>> boolean expectLess(String msg, T expected,
+ T actual) {
+ return expectTrue(String.format("%s: (expected = %s was not greater than actual = %s) ",
+ msg, expected, actual), actual.compareTo(expected) < 0);
+ }
+
+ /**
+ * Check that the {@code actual} value is less than or equal to the {@code expected} value.
+ *
+ * @param msg Message to be logged when check fails.
+ * @param expected The expected value to check that the actual value is less than or equal to.
+ * @param actual Actual value to check.
+ * @return {@code true} if {@code actual} is less than or equal to {@code expected}.
+ */
+ public <T extends Comparable<? super T>> boolean expectLessOrEqual(String msg, T expected,
+ T actual) {
+ return expectTrue(String.format("%s: (expected = %s was not greater than actual = %s) ",
+ msg, expected, actual), actual.compareTo(expected) <= 0);
+ }
+
+ /**
+ * Check if the two float values are equal with given error tolerance.
+ *
+ * @param msg Message to be logged when check fails.
+ * @param expected Expected value to be checked against.
+ * @param actual Actual value to be checked.
+ * @param tolerance The error margin for the equality check.
+ * @return {@code true} if the two values are equal, {@code false} otherwise.
+ */
+ public <T> boolean expectEquals(String msg, float expected, float actual, float tolerance) {
+ if (expected == actual) {
+ return true;
+ }
+
+ if (!(Math.abs(expected - actual) <= tolerance)) {
+ addMessage(String.format("%s (expected = %s, actual = %s, tolerance = %s) ", msg,
+ expected, actual, tolerance));
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Check if the two double values are equal with given error tolerance.
+ *
+ * @param msg Message to be logged when check fails.
+ * @param expected Expected value to be checked against.
+ * @param actual Actual value to be checked.
+ * @param tolerance The error margin for the equality check
+ * @return {@code true} if the two values are equal, {@code false} otherwise.
+ */
+ public <T> boolean expectEquals(String msg, double expected, double actual, double tolerance) {
+ if (expected == actual) {
+ return true;
+ }
+
+ if (!(Math.abs(expected - actual) <= tolerance)) {
+ addMessage(String.format("%s (expected = %s, actual = %s, tolerance = %s) ", msg,
+ expected, actual, tolerance));
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Check that all values in the list are greater than or equal to the min value.
+ *
+ * @param msg Message to be logged when check fails
+ * @param list The list of values to be checked
+ * @param min The smallest allowed value
+ */
+ public <T extends Comparable<? super T>> void expectValuesGreaterOrEqual(String msg,
+ List<T> list, T min) {
+ for (T value : list) {
+ expectTrue(msg + String.format(", array value " + value.toString() +
+ " is less than %s",
+ min.toString()), value.compareTo(min) >= 0);
+ }
+ }
+
+ /**
+ * Check that all values in the array are greater than or equal to the min value.
+ *
+ * @param msg Message to be logged when check fails
+ * @param array The array of values to be checked
+ * @param min The smallest allowed value
+ */
+ public <T extends Comparable<? super T>> void expectValuesGreaterOrEqual(String msg,
+ T[] array, T min) {
+ expectValuesGreaterOrEqual(msg, Arrays.asList(array), min);
+ }
+
+ /**
+ * Expect the list of values are in the range.
+ *
+ * @param msg Message to be logged
+ * @param list The list of values to be checked
+ * @param min The min value of the range
+ * @param max The max value of the range
+ */
+ public <T extends Comparable<? super T>> void expectValuesInRange(String msg, List<T> list,
+ T min, T max) {
+ for (T value : list) {
+ expectTrue(msg + String.format(", array value " + value.toString() +
+ " is out of range [%s, %s]",
+ min.toString(), max.toString()),
+ value.compareTo(max)<= 0 && value.compareTo(min) >= 0);
+ }
+ }
+
+ /**
+ * Expect the array of values are in the range.
+ *
+ * @param msg Message to be logged
+ * @param array The array of values to be checked
+ * @param min The min value of the range
+ * @param max The max value of the range
+ */
+ public <T extends Comparable<? super T>> void expectValuesInRange(String msg, T[] array,
+ T min, T max) {
+ expectValuesInRange(msg, Arrays.asList(array), min, max);
+ }
+
+ /**
+ * Expect the array of values are in the range.
+ *
+ * @param msg Message to be logged
+ * @param array The array of values to be checked
+ * @param min The min value of the range
+ * @param max The max value of the range
+ */
+ public void expectValuesInRange(String msg, int[] array, int min, int max) {
+ ArrayList<Integer> l = new ArrayList<>(array.length);
+ for (int i : array) {
+ l.add(i);
+ }
+ expectValuesInRange(msg, l, min, max);
+ }
+
+ /**
+ * Expect the value is in the range.
+ *
+ * @param msg Message to be logged
+ * @param value The value to be checked
+ * @param min The min value of the range
+ * @param max The max value of the range
+ *
+ * @return {@code true} if the value was in range, {@code false} otherwise
+ */
+ public <T extends Comparable<? super T>> boolean expectInRange(String msg, T value,
+ T min, T max) {
+ return expectTrue(msg + String.format(", value " + value.toString()
+ + " is out of range [%s, %s]",
+ min.toString(), max.toString()),
+ value.compareTo(max)<= 0 && value.compareTo(min) >= 0);
+ }
+
+
+ /**
+ * Check that two metering region arrays are similar enough by ensuring that each of their width,
+ * height, and all corners are within {@code errorPercent} of each other.
+ *
+ * <p>Note that the length of the arrays must be the same, and each weight must be the same
+ * as well. We assume the order is also equivalent.</p>
+ *
+ * <p>At most 1 error per each dissimilar metering region is collected.</p>
+ *
+ * @param msg Message to be logged
+ * @param expected The reference 'expected' values to be used to check against
+ * @param actual The actual values that were received
+ * @param errorPercent Within how many percent the components should be
+ *
+ * @return {@code true} if all expects passed, {@code false} otherwise
+ */
+ public boolean expectMeteringRegionsAreSimilar(String msg,
+ MeteringRectangle[] expected, MeteringRectangle[] actual,
+ float errorPercent) {
+ String expectedActualMsg = String.format("expected (%s), actual (%s)",
+ Arrays.deepToString(expected), Arrays.deepToString(actual));
+
+ String differentSizesMsg = String.format(
+ "%s: rect lists are different sizes; %s",
+ msg, expectedActualMsg);
+
+ String differentWeightsMsg = String.format(
+ "%s: rect weights are different; %s",
+ msg, expectedActualMsg);
+
+ if (!expectTrue(differentSizesMsg, actual != null)) {
+ return false;
+ }
+
+ if (!expectEquals(differentSizesMsg, expected.length, actual.length)) return false;
+
+ boolean succ = true;
+ for (int i = 0; i < expected.length; ++i) {
+ if (i < actual.length) {
+ // Avoid printing multiple errors for the same rectangle
+ if (!expectRectsAreSimilar(
+ msg, expected[i].getRect(), actual[i].getRect(), errorPercent)) {
+ succ = false;
+ continue;
+ }
+ if (!expectEquals(differentWeightsMsg,
+ expected[i].getMeteringWeight(), actual[i].getMeteringWeight())) {
+ succ = false;
+ continue;
+ }
+ }
+ }
+
+ return succ;
+ }
+
+ /**
+ * Check that two rectangles are similar enough by ensuring that their width, height,
+ * and all corners are within {@code errorPercent} of each other.
+ *
+ * <p>Only the first error is collected, to avoid spamming several error messages when
+ * the rectangle is hugely dissimilar.</p>
+ *
+ * @param msg Message to be logged
+ * @param expected The reference 'expected' value to be used to check against
+ * @param actual The actual value that was received
+ * @param errorPercent Within how many percent the components should be
+ *
+ * @return {@code true} if all expects passed, {@code false} otherwise
+ */
+ public boolean expectRectsAreSimilar(String msg, Rect expected, Rect actual,
+ float errorPercent) {
+ String formattedMsg = String.format("%s: rects are not similar enough; expected (%s), " +
+ "actual (%s), error percent (%s), reason: ",
+ msg, expected, actual, errorPercent);
+
+ if (!expectSimilarValues(
+ formattedMsg, "too wide", "too narrow", actual.width(), expected.width(),
+ errorPercent)) return false;
+
+ if (!expectSimilarValues(
+ formattedMsg, "too tall", "too short", actual.height(), expected.height(),
+ errorPercent)) return false;
+
+ if (!expectSimilarValues(
+ formattedMsg, "left pt too right", "left pt too left", actual.left, expected.left,
+ errorPercent)) return false;
+
+ if (!expectSimilarValues(
+ formattedMsg, "right pt too right", "right pt too left",
+ actual.right, expected.right, errorPercent)) return false;
+
+ if (!expectSimilarValues(
+ formattedMsg, "top pt too low", "top pt too high", actual.top, expected.top,
+ errorPercent)) return false;
+
+ if (!expectSimilarValues(
+ formattedMsg, "bottom pt too low", "bottom pt too high", actual.top, expected.top,
+ errorPercent)) return false;
+
+ return true;
+ }
+
+ /**
+ * Check that two sizes are similar enough by ensuring that their width and height
+ * are within {@code errorPercent} of each other.
+ *
+ * <p>Only the first error is collected, to avoid spamming several error messages when
+ * the rectangle is hugely dissimilar.</p>
+ *
+ * @param msg Message to be logged
+ * @param expected The reference 'expected' value to be used to check against
+ * @param actual The actual value that was received
+ * @param errorPercent Within how many percent the components should be
+ *
+ * @return {@code true} if all expects passed, {@code false} otherwise
+ */
+ public boolean expectSizesAreSimilar(String msg, Size expected, Size actual,
+ float errorPercent) {
+ String formattedMsg = String.format("%s: rects are not similar enough; expected (%s), " +
+ "actual (%s), error percent (%s), reason: ",
+ msg, expected, actual, errorPercent);
+
+ if (!expectSimilarValues(
+ formattedMsg, "too wide", "too narrow", actual.getWidth(), expected.getWidth(),
+ errorPercent)) return false;
+
+ if (!expectSimilarValues(
+ formattedMsg, "too tall", "too short", actual.getHeight(), expected.getHeight(),
+ errorPercent)) return false;
+
+ return true;
+ }
+
+ /**
+ * Check that the rectangle is centered within a certain tolerance of {@code errorPercent},
+ * with respect to the {@code bounds} bounding rectangle.
+ *
+ * @param msg Message to be logged
+ * @param expectedBounds The width/height of the bounding rectangle
+ * @param actual The actual value that was received
+ * @param errorPercent Within how many percent the centering should be
+ */
+ public void expectRectCentered(String msg, Size expectedBounds, Rect actual,
+ float errorPercent) {
+ String formattedMsg = String.format("%s: rect should be centered; expected bounds (%s), " +
+ "actual (%s), error percent (%s), reason: ",
+ msg, expectedBounds, actual, errorPercent);
+
+ int centerBoundX = expectedBounds.getWidth() / 2;
+ int centerBoundY = expectedBounds.getHeight() / 2;
+
+ expectSimilarValues(
+ formattedMsg, "too low", "too high", actual.centerY(), centerBoundY,
+ errorPercent);
+
+ expectSimilarValues(
+ formattedMsg, "too right", "too left", actual.centerX(), centerBoundX,
+ errorPercent);
+ }
+
+ private boolean expectSimilarValues(
+ String formattedMsg, String tooSmall, String tooLarge, int actualValue,
+ int expectedValue, float errorPercent) {
+ boolean succ = true;
+ succ = expectTrue(formattedMsg + tooLarge,
+ actualValue <= (expectedValue * (1.0f + errorPercent))) && succ;
+ succ = expectTrue(formattedMsg + tooSmall,
+ actualValue >= (expectedValue * (1.0f - errorPercent))) && succ;
+
+ return succ;
+ }
+
+ public void expectNotNull(String msg, Object obj) {
+ checkThat(msg, obj, CoreMatchers.notNullValue());
+ }
+
+ public void expectNull(String msg, Object obj) {
+ if (obj != null) {
+ addMessage(msg);
+ }
+ }
+
+ /**
+ * Check if the values in the array are monotonically increasing (decreasing) and not all
+ * equal.
+ *
+ * @param array The array of values to be checked
+ * @param ascendingOrder The monotonicity ordering to be checked with
+ */
+ public <T extends Comparable<? super T>> void checkArrayMonotonicityAndNotAllEqual(T[] array,
+ boolean ascendingOrder) {
+ String orderMsg = ascendingOrder ? ("increasing order") : ("decreasing order");
+ for (int i = 0; i < array.length - 1; i++) {
+ int compareResult = array[i + 1].compareTo(array[i]);
+ boolean condition = compareResult >= 0;
+ if (!ascendingOrder) {
+ condition = compareResult <= 0;
+ }
+
+ expectTrue(String.format("Adjacent values (%s and %s) %s monotonicity is broken",
+ array[i].toString(), array[i + 1].toString(), orderMsg), condition);
+ }
+
+ expectTrue("All values of this array are equal: " + array[0].toString(),
+ array[0].compareTo(array[array.length - 1]) != 0);
+ }
+
+ /**
+ * Check if the key value is not null and return the value.
+ *
+ * @param characteristics The {@link CameraCharacteristics} to get the key from.
+ * @param key The {@link CameraCharacteristics} key to be checked.
+ *
+ * @return The value of the key.
+ */
+ public <T> T expectKeyValueNotNull(CameraCharacteristics characteristics,
+ CameraCharacteristics.Key<T> key) {
+
+ T value = characteristics.get(key);
+ if (value == null) {
+ addMessage("Key " + key.getName() + " shouldn't be null");
+ }
+
+ return value;
+ }
+
+ /**
+ * Check if the key value is not null and return the value.
+ *
+ * @param request The {@link CaptureRequest} to get the key from.
+ * @param key The {@link CaptureRequest} key to be checked.
+ *
+ * @return The value of the key.
+ */
+ public <T> T expectKeyValueNotNull(CaptureRequest request,
+ CaptureRequest.Key<T> key) {
+
+ T value = request.get(key);
+ if (value == null) {
+ addMessage("Key " + key.getName() + " shouldn't be null");
+ }
+
+ return value;
+ }
+
+ /**
+ * Check if the key value is not null and return the value.
+ *
+ * @param request The {@link CaptureRequest#Builder} to get the key from.
+ * @param key The {@link CaptureRequest} key to be checked.
+ * @return The value of the key.
+ */
+ public <T> T expectKeyValueNotNull(Builder request, CaptureRequest.Key<T> key) {
+
+ T value = request.get(key);
+ if (value == null) {
+ addMessage("Key " + key.getName() + " shouldn't be null");
+ }
+
+ return value;
+ }
+
+ /**
+ * Check if the key value is not null and return the value.
+ *
+ * @param result The {@link CaptureResult} to get the key from.
+ * @param key The {@link CaptureResult} key to be checked.
+ * @return The value of the key.
+ */
+ public <T> T expectKeyValueNotNull(CaptureResult result, CaptureResult.Key<T> key) {
+ return expectKeyValueNotNull("", result, key);
+ }
+
+ /**
+ * Check if the key value is not null and return the value.
+ *
+ * @param msg The message to be logged.
+ * @param result The {@link CaptureResult} to get the key from.
+ * @param key The {@link CaptureResult} key to be checked.
+ * @return The value of the key.
+ */
+ public <T> T expectKeyValueNotNull(String msg, CaptureResult result, CaptureResult.Key<T> key) {
+
+ T value = result.get(key);
+ if (value == null) {
+ addMessage(msg + " Key " + key.getName() + " shouldn't be null");
+ }
+
+ return value;
+ }
+
+ /**
+ * Check if the key is non-null and the value is not equal to target.
+ *
+ * @param request The The {@link CaptureRequest#Builder} to get the key from.
+ * @param key The {@link CaptureRequest} key to be checked.
+ * @param expected The expected value of the CaptureRequest key.
+ */
+ public <T> void expectKeyValueNotEquals(
+ Builder request, CaptureRequest.Key<T> key, T expected) {
+ if (request == null || key == null || expected == null) {
+ throw new IllegalArgumentException("request, key and expected shouldn't be null");
+ }
+
+ T value;
+ if ((value = expectKeyValueNotNull(request, key)) == null) {
+ return;
+ }
+
+ String reason = "Key " + key.getName() + " shouldn't have value " + value.toString();
+ checkThat(reason, value, CoreMatchers.not(expected));
+ }
+
+ /**
+ * Check if the key is non-null and the value is not equal to target.
+ *
+ * @param result The {@link CaptureResult} to get the key from.
+ * @param key The {@link CaptureResult} key to be checked.
+ * @param expected The expected value of the CaptureResult key.
+ */
+ public <T> void expectKeyValueNotEquals(
+ CaptureResult result, CaptureResult.Key<T> key, T expected) {
+ if (result == null || key == null || expected == null) {
+ throw new IllegalArgumentException("result, key and expected shouldn't be null");
+ }
+
+ T value;
+ if ((value = expectKeyValueNotNull(result, key)) == null) {
+ return;
+ }
+
+ String reason = "Key " + key.getName() + " shouldn't have value " + value.toString();
+ checkThat(reason, value, CoreMatchers.not(expected));
+ }
+
+ /**
+ * Check if the value is non-null and the value is equal to target.
+ *
+ * @param result The {@link CaptureResult} to lookup the value in.
+ * @param key The {@link CaptureResult} key to be checked.
+ * @param expected The expected value of the {@link CaptureResult} key.
+ */
+ public <T> void expectKeyValueEquals(CaptureResult result, CaptureResult.Key<T> key,
+ T expected) {
+ if (result == null || key == null || expected == null) {
+ throw new IllegalArgumentException("request, key and expected shouldn't be null");
+ }
+
+ T value;
+ if ((value = expectKeyValueNotNull(result, key)) == null) {
+ return;
+ }
+
+ String reason = "Key " + key.getName() + " value " + value.toString()
+ + " doesn't match the expected value " + expected.toString();
+ checkThat(reason, value, CoreMatchers.equalTo(expected));
+ }
+
+ /**
+ * Check if the key is non-null and the value is equal to target.
+ *
+ * <p>Only check non-null if the target is null.</p>
+ *
+ * @param request The The {@link CaptureRequest#Builder} to get the key from.
+ * @param key The {@link CaptureRequest} key to be checked.
+ * @param expected The expected value of the CaptureRequest key.
+ */
+ public <T> void expectKeyValueEquals(Builder request, CaptureRequest.Key<T> key, T expected) {
+ if (request == null || key == null || expected == null) {
+ throw new IllegalArgumentException("request, key and expected shouldn't be null");
+ }
+
+ T value;
+ if ((value = expectKeyValueNotNull(request, key)) == null) {
+ return;
+ }
+
+ String reason = "Key " + key.getName() + " value " + value.toString()
+ + " doesn't match the expected value " + expected.toString();
+ checkThat(reason, value, CoreMatchers.equalTo(expected));
+ }
+
+ /**
+ * Check if the key is non-null, and the key value is greater than the expected value.
+ *
+ * @param result {@link CaptureResult} to check.
+ * @param key The {@link CaptureResult} key to be checked.
+ * @param expected The expected to be compared to the value for the given key.
+ */
+ public <T extends Comparable<? super T>> void expectKeyValueGreaterOrEqual(
+ CaptureResult result, CaptureResult.Key<T> key, T expected) {
+ T value;
+ if ((value = expectKeyValueNotNull(result, key)) == null) {
+ return;
+ }
+
+ expectGreaterOrEqual(key.getName(), expected, value);
+ }
+
+ /**
+ * Check if the key is non-null, and the key value is greater than the expected value.
+ *
+ * @param characteristics {@link CameraCharacteristics} to check.
+ * @param key The {@link CameraCharacteristics} key to be checked.
+ * @param expected The expected to be compared to the value for the given key.
+ */
+ public <T extends Comparable<? super T>> void expectKeyValueGreaterThan(
+ CameraCharacteristics characteristics, CameraCharacteristics.Key<T> key, T expected) {
+ T value;
+ if ((value = expectKeyValueNotNull(characteristics, key)) == null) {
+ return;
+ }
+
+ expectGreater(key.getName(), expected, value);
+ }
+
+ /**
+ * Check if the key is non-null, and the key value is in the expected range.
+ *
+ * @param characteristics {@link CameraCharacteristics} to check.
+ * @param key The {@link CameraCharacteristics} key to be checked.
+ * @param min The min value of the range
+ * @param max The max value of the range
+ */
+ public <T extends Comparable<? super T>> void expectKeyValueInRange(
+ CameraCharacteristics characteristics, CameraCharacteristics.Key<T> key, T min, T max) {
+ T value;
+ if ((value = expectKeyValueNotNull(characteristics, key)) == null) {
+ return;
+ }
+ expectInRange(key.getName(), value, min, max);
+ }
+
+ /**
+ * Check if the key is non-null, and the key value is one of the expected values.
+ *
+ * @param characteristics {@link CameraCharacteristics} to check.
+ * @param key The {@link CameraCharacteristics} key to be checked.
+ * @param expected The expected values for the given key.
+ */
+ public <T> void expectKeyValueIsIn(CameraCharacteristics characteristics,
+ CameraCharacteristics.Key<T> key, T... expected) {
+ T value = expectKeyValueNotNull(characteristics, key);
+ if (value == null) {
+ return;
+ }
+ String reason = "Key " + key.getName() + " value " + value
+ + " isn't one of the expected values " + Arrays.deepToString(expected);
+ expectContains(reason, expected, value);
+ }
+
+ /**
+ * Check if the key is non-null, and the key value is one of the expected values.
+ *
+ * @param request The The {@link CaptureRequest#Builder} to get the key from.
+ * @param key The {@link CaptureRequest} key to be checked.
+ * @param expected The expected values of the CaptureRequest key.
+ */
+ public <T> void expectKeyValueIsIn(Builder request, CaptureRequest.Key<T> key, T... expected) {
+ T value = expectKeyValueNotNull(request, key);
+ if (value == null) {
+ return;
+ }
+ String reason = "Key " + key.getName() + " value " + value
+ + " isn't one of the expected values " + Arrays.deepToString(expected);
+ expectContains(reason, expected, value);
+ }
+
+ /**
+ * Check if the key is non-null, and the key value contains the expected element.
+ *
+ * @param characteristics {@link CameraCharacteristics} to check.
+ * @param key The {@link CameraCharacteristics} key to be checked.
+ * @param expected The expected element to be contained in the value for the given key.
+ */
+ public <T> void expectKeyValueContains(CameraCharacteristics characteristics,
+ CameraCharacteristics.Key<T[]> key, T expected) {
+ T[] value;
+ if ((value = expectKeyValueNotNull(characteristics, key)) == null) {
+ return;
+ }
+ String reason = "Key " + key.getName() + " value " + value
+ + " doesn't contain the expected value " + expected;
+ expectContains(reason, value, expected);
+ }
+
+ /**
+ * Check if the key is non-null, and the key value contains the expected element.
+ *
+ * @param characteristics {@link CameraCharacteristics} to check.
+ * @param key The {@link CameraCharacteristics} key to be checked.
+ * @param expected The expected element to be contained in the value for the given key.
+ */
+ public void expectKeyValueContains(CameraCharacteristics characteristics,
+ CameraCharacteristics.Key<int[]> key, int expected) {
+ int[] value;
+ if ((value = expectKeyValueNotNull(characteristics, key)) == null) {
+ return;
+ }
+ String reason = "Key " + key.getName() + " value " + value
+ + " doesn't contain the expected value " + expected;
+ expectContains(reason, value, expected);
+ }
+
+ /**
+ * Check if the key is non-null, and the key value contains the expected element.
+ *
+ * @param characteristics {@link CameraCharacteristics} to check.
+ * @param key The {@link CameraCharacteristics} key to be checked.
+ * @param expected The expected element to be contained in the value for the given key.
+ */
+ public void expectKeyValueContains(CameraCharacteristics characteristics,
+ CameraCharacteristics.Key<boolean[]> key, boolean expected) {
+ boolean[] value;
+ if ((value = expectKeyValueNotNull(characteristics, key)) == null) {
+ return;
+ }
+ String reason = "Key " + key.getName() + " value " + value
+ + " doesn't contain the expected value " + expected;
+ expectContains(reason, value, expected);
+ }
+
+ /**
+ * Check if the {@code values} array contains the expected element.
+ *
+ * @param reason reason to print for failure.
+ * @param values array to check for membership in.
+ * @param expected the value to check.
+ */
+ public <T> void expectContains(String reason, T[] values, T expected) {
+ if (values == null) {
+ throw new NullPointerException();
+ }
+ checkThat(reason, expected, InMatcher.in(values));
+ }
+
+ public <T> void expectContains(T[] values, T expected) {
+ String reason = "Expected value " + expected
+ + " is not contained in the given values " + values;
+ expectContains(reason, values, expected);
+ }
+
+ /**
+ * Specialize {@link InMatcher} class for integer primitive array.
+ */
+ private static class IntInMatcher extends InMatcher<Integer> {
+ public IntInMatcher(int[] values) {
+ Preconditions.checkNotNull("values", values);
+ mValues = new ArrayList<>(values.length);
+ for (int i : values) {
+ mValues.add(i);
+ }
+ }
+ }
+
+ /**
+ * Check if the {@code values} array contains the expected element.
+ *
+ * <p>Specialized for primitive int arrays</p>
+ *
+ * @param reason reason to print for failure.
+ * @param values array to check for membership in.
+ * @param expected the value to check.
+ */
+ public void expectContains(String reason, int[] values, int expected) {
+ if (values == null) {
+ throw new NullPointerException();
+ }
+
+ checkThat(reason, expected, new IntInMatcher(values));
+ }
+
+ public void expectContains(int[] values, int expected) {
+ String reason = "Expected value " + expected
+ + " is not contained in the given values " + values;
+ expectContains(reason, values, expected);
+ }
+
+ /**
+ * Specialize {@link BooleanInMatcher} class for boolean primitive array.
+ */
+ private static class BooleanInMatcher extends InMatcher<Boolean> {
+ public BooleanInMatcher(boolean[] values) {
+ Preconditions.checkNotNull("values", values);
+ mValues = new ArrayList<>(values.length);
+ for (boolean i : values) {
+ mValues.add(i);
+ }
+ }
+ }
+
+ /**
+ * Check if the {@code values} array contains the expected element.
+ *
+ * <p>Specialized for primitive boolean arrays</p>
+ *
+ * @param reason reason to print for failure.
+ * @param values array to check for membership in.
+ * @param expected the value to check.
+ */
+ public void expectContains(String reason, boolean[] values, boolean expected) {
+ if (values == null) {
+ throw new NullPointerException();
+ }
+
+ checkThat(reason, expected, new BooleanInMatcher(values));
+ }
+
+ /**
+ * Check if the {@code values} array contains the expected element.
+ *
+ * <p>Specialized for primitive boolean arrays</p>
+ *
+ * @param values array to check for membership in.
+ * @param expected the value to check.
+ */
+ public void expectContains(boolean[] values, boolean expected) {
+ String reason = "Expected value " + expected
+ + " is not contained in the given values " + values;
+ expectContains(reason, values, expected);
+ }
+
+ /**
+ * Check if the element inside of the list are unique.
+ *
+ * @param msg The message to be logged
+ * @param list The list of values to be checked
+ */
+ public <T> void expectValuesUnique(String msg, List<T> list) {
+ Set<T> sizeSet = new HashSet<T>(list);
+ expectTrue(msg + " each element must be distinct", sizeSet.size() == list.size());
+ }
+
+ public void expectImageProperties(String msg, Image image, int format, Size size,
+ long timestampNs) {
+ expectEquals(msg + "Image format is wrong.", image.getFormat(), format);
+ expectEquals(msg + "Image width is wrong.", image.getWidth(), size.getWidth());
+ expectEquals(msg + "Image height is wrong.", image.getHeight(), size.getHeight());
+ expectEquals(msg + "Image timestamp is wrong.", image.getTimestamp(), timestampNs);
+ }
+
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/CameraTestHelper.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestHelper.java
similarity index 97%
rename from media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/CameraTestHelper.java
rename to media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestHelper.java
index 8bf741c..84153d60 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/CameraTestHelper.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestHelper.java
@@ -14,7 +14,9 @@
* limitations under the License.
*/
-package com.android.mediaframeworktest;
+package com.android.mediaframeworktest.helpers;
+
+import junit.framework.Assert;
import android.hardware.Camera;
import android.hardware.Camera.Parameters;
@@ -24,15 +26,11 @@
import android.util.Log;
import android.view.SurfaceHolder;
-import java.io.BufferedWriter;
import java.io.File;
-import java.io.FilenameFilter;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
-import junit.framework.Assert;
-
public class CameraTestHelper {
public Camera mCamera;
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestResultPrinter.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestResultPrinter.java
new file mode 100644
index 0000000..2492109
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestResultPrinter.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mediaframeworktest.helpers;
+
+import android.app.Instrumentation;
+import android.os.Bundle;
+import android.os.Environment;
+import android.util.Log;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+
+public class CameraTestResultPrinter {
+
+ private static final String TAG = CameraTestResultPrinter.class.getSimpleName();
+ private static final String RESULT_DIR = Environment.getExternalStorageDirectory() +
+ "/camera-out/";
+ private static final String RESULT_FILE_FORMAT = "fwk-stress_camera_%s.txt";
+ private static final String RESULT_SWAP_FILE = "fwk-stress.swp";
+ private static final String KEY_NUM_ATTEMPTS = "numAttempts"; // Total number of iterations
+ private static final String KEY_ITERATION = "iteration";
+ private static final String KEY_CAMERA_ID = "cameraId";
+ private static final int INST_STATUS_IN_PROGRESS = 2;
+
+ private Instrumentation mInst = null;
+ private boolean mWriteToFile = true;
+
+
+ public CameraTestResultPrinter(Instrumentation instrumentation, boolean writeToFile) {
+ mInst = instrumentation;
+ mWriteToFile = writeToFile;
+
+ // Create a log directory if not exists.
+ File baseDir = new File(RESULT_DIR);
+ if (!baseDir.exists() && !baseDir.mkdirs()) {
+ throw new IllegalStateException("Couldn't create directory for logs: " + baseDir);
+ }
+ Log.v(TAG, String.format("Saving test results under: %s", baseDir.getAbsolutePath()));
+ // Remove all logs but not the base directory before a test run.
+ purgeFiles(baseDir);
+ }
+
+ public void printStatus(int numAttempts, int iteration, String cameraId) throws Exception {
+ Log.v(TAG, String.format("Print status: numAttempts=%d iteration=%d cameraId=%s",
+ numAttempts, iteration, cameraId));
+ // Write stats to instrumentation results.
+ sendInstrumentationStatus(numAttempts, iteration, cameraId);
+
+ if (mWriteToFile) {
+ writeToFile(numAttempts, iteration, cameraId);
+ }
+ }
+
+ /**
+ * Report the test results to instrumentation status or a file.
+ */
+ public void printStatus(int numAttempts, int iteration) throws Exception {
+ printStatus(numAttempts, iteration, "");
+ }
+
+ /**
+ * Write stats to instrumentation results.
+ */
+ private void sendInstrumentationStatus(int numAttempts, int iteration, String cameraId)
+ throws Exception {
+ Bundle output = new Bundle();
+ output.putString(KEY_NUM_ATTEMPTS, String.valueOf(numAttempts));
+ output.putString(KEY_ITERATION, String.valueOf(iteration));
+ if (!"".equals(cameraId)) {
+ output.putString(KEY_CAMERA_ID, cameraId);
+ }
+ mInst.sendStatus(INST_STATUS_IN_PROGRESS, output);
+ }
+
+ private void writeToFile(final int numAttempts, final int iteration, String cameraId) {
+ // Format output in a form of pairs of key and value
+ // eg, "numAttempts=500|iteration=400[|cameraId=0]"
+ String results = String.format("%s=%d|%s=%d", KEY_NUM_ATTEMPTS, numAttempts,
+ KEY_ITERATION, iteration);
+ if (!"".equals(cameraId)) {
+ results += String.format("|%s=%s", KEY_CAMERA_ID, cameraId);
+ }
+ Log.v(TAG, String.format("Writing result to a file: %s", results));
+
+ // Write results to a swap file temporarily, then rename it to a text file when writing
+ // has successfully completed, so that process crash during file writing would
+ // not corrupt the file.
+ File swapFile = new File(RESULT_DIR, RESULT_SWAP_FILE);
+ BufferedWriter out = null;
+ try {
+ out = new BufferedWriter(new FileWriter(swapFile));
+ out.write(results);
+ out.flush();
+ } catch (Exception e) {
+ Log.w(TAG, String.format("Failed to write results to a file: %s", e));
+ } finally {
+ if (out != null) {
+ try {
+ out.close();
+ // Delete an old file just before renaming, instead of overwriting.
+ String resultFileName = String.format(RESULT_FILE_FORMAT, cameraId);
+ File txtFile = new File(RESULT_DIR, resultFileName);
+ txtFile.delete();
+ swapFile.renameTo(txtFile);
+ } catch (Exception e) {
+ Log.w(TAG, String.format("Failed to write results to a file: %s", e));
+ }
+ }
+ }
+ }
+
+ // Remove sub directories and their contents, but not given directory.
+ private void purgeFiles(File path) {
+ File[] files = path.listFiles();
+ if (files != null) {
+ for (File child : files) {
+ if (path.isDirectory()) {
+ purgeFiles(child);
+ }
+ child.delete();
+ }
+ }
+ }
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java
new file mode 100644
index 0000000..b2be464
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java
@@ -0,0 +1,2158 @@
+/*
+ * Copyright 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mediaframeworktest.helpers;
+
+import com.android.ex.camera2.blocking.BlockingCameraManager;
+import com.android.ex.camera2.blocking.BlockingCameraManager.BlockingOpenException;
+import com.android.ex.camera2.blocking.BlockingSessionCallback;
+import com.android.ex.camera2.blocking.BlockingStateCallback;
+import com.android.ex.camera2.exceptions.TimeoutRuntimeException;
+
+import junit.framework.Assert;
+
+import org.mockito.Mockito;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.ImageFormat;
+import android.graphics.PointF;
+import android.graphics.Rect;
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraCaptureSession;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraConstrainedHighSpeedCaptureSession;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CameraManager;
+import android.hardware.camera2.CaptureFailure;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.hardware.camera2.TotalCaptureResult;
+import android.hardware.camera2.params.InputConfiguration;
+import android.hardware.camera2.params.MeteringRectangle;
+import android.hardware.camera2.params.StreamConfigurationMap;
+import android.location.Location;
+import android.location.LocationManager;
+import android.media.ExifInterface;
+import android.media.Image;
+import android.media.Image.Plane;
+import android.media.ImageReader;
+import android.media.ImageWriter;
+import android.os.Build;
+import android.os.Environment;
+import android.os.Handler;
+import android.util.Log;
+import android.util.Pair;
+import android.util.Size;
+import android.view.Display;
+import android.view.Surface;
+import android.view.WindowManager;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.nio.ByteBuffer;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * A package private utility class for wrapping up the camera2 framework test common utility
+ * functions
+ */
+/**
+ * (non-Javadoc)
+ * @see android.hardware.camera2.cts.CameraTestUtils
+ */
+public class CameraTestUtils extends Assert {
+ private static final String TAG = "CameraTestUtils";
+ private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
+ private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+ public static final Size SIZE_BOUND_1080P = new Size(1920, 1088);
+ public static final Size SIZE_BOUND_2160P = new Size(3840, 2160);
+ // Only test the preview size that is no larger than 1080p.
+ public static final Size PREVIEW_SIZE_BOUND = SIZE_BOUND_1080P;
+ // Default timeouts for reaching various states
+ public static final int CAMERA_OPEN_TIMEOUT_MS = 3000;
+ public static final int CAMERA_CLOSE_TIMEOUT_MS = 3000;
+ public static final int CAMERA_IDLE_TIMEOUT_MS = 3000;
+ public static final int CAMERA_ACTIVE_TIMEOUT_MS = 1000;
+ public static final int CAMERA_BUSY_TIMEOUT_MS = 1000;
+ public static final int CAMERA_UNCONFIGURED_TIMEOUT_MS = 1000;
+ public static final int CAMERA_CONFIGURE_TIMEOUT_MS = 3000;
+ public static final int CAPTURE_RESULT_TIMEOUT_MS = 3000;
+ public static final int CAPTURE_IMAGE_TIMEOUT_MS = 3000;
+
+ public static final int SESSION_CONFIGURE_TIMEOUT_MS = 3000;
+ public static final int SESSION_CLOSE_TIMEOUT_MS = 3000;
+ public static final int SESSION_READY_TIMEOUT_MS = 3000;
+ public static final int SESSION_ACTIVE_TIMEOUT_MS = 1000;
+
+ public static final int MAX_READER_IMAGES = 5;
+
+ private static final int EXIF_DATETIME_LENGTH = 19;
+ private static final int EXIF_DATETIME_ERROR_MARGIN_SEC = 60;
+ private static final float EXIF_FOCAL_LENGTH_ERROR_MARGIN = 0.001f;
+ private static final float EXIF_EXPOSURE_TIME_ERROR_MARGIN_RATIO = 0.05f;
+ private static final float EXIF_EXPOSURE_TIME_MIN_ERROR_MARGIN_SEC = 0.002f;
+ private static final float EXIF_APERTURE_ERROR_MARGIN = 0.001f;
+
+ private static final Location sTestLocation0 = new Location(LocationManager.GPS_PROVIDER);
+ private static final Location sTestLocation1 = new Location(LocationManager.GPS_PROVIDER);
+ private static final Location sTestLocation2 = new Location(LocationManager.NETWORK_PROVIDER);
+
+ protected static final String DEBUG_FILE_NAME_BASE =
+ Environment.getExternalStorageDirectory().getPath();
+
+ static {
+ sTestLocation0.setTime(1199145600L);
+ sTestLocation0.setLatitude(37.736071);
+ sTestLocation0.setLongitude(-122.441983);
+ sTestLocation0.setAltitude(21.0);
+
+ sTestLocation1.setTime(1199145601L);
+ sTestLocation1.setLatitude(0.736071);
+ sTestLocation1.setLongitude(0.441983);
+ sTestLocation1.setAltitude(1.0);
+
+ sTestLocation2.setTime(1199145602L);
+ sTestLocation2.setLatitude(-89.736071);
+ sTestLocation2.setLongitude(-179.441983);
+ sTestLocation2.setAltitude(100000.0);
+ }
+
+ // Exif test data vectors.
+ public static final ExifTestData[] EXIF_TEST_DATA = {
+ new ExifTestData(
+ /*gpsLocation*/ sTestLocation0,
+ /* orientation */90,
+ /* jpgQuality */(byte) 80,
+ /* thumbQuality */(byte) 75),
+ new ExifTestData(
+ /*gpsLocation*/ sTestLocation1,
+ /* orientation */180,
+ /* jpgQuality */(byte) 90,
+ /* thumbQuality */(byte) 85),
+ new ExifTestData(
+ /*gpsLocation*/ sTestLocation2,
+ /* orientation */270,
+ /* jpgQuality */(byte) 100,
+ /* thumbQuality */(byte) 100)
+ };
+
+ /**
+ * Create an {@link ImageReader} object and get the surface.
+ *
+ * @param size The size of this ImageReader to be created.
+ * @param format The format of this ImageReader to be created
+ * @param maxNumImages The max number of images that can be acquired simultaneously.
+ * @param listener The listener used by this ImageReader to notify callbacks.
+ * @param handler The handler to use for any listener callbacks.
+ */
+ public static ImageReader makeImageReader(Size size, int format, int maxNumImages,
+ ImageReader.OnImageAvailableListener listener, Handler handler) {
+ ImageReader reader;
+ reader = ImageReader.newInstance(size.getWidth(), size.getHeight(), format,
+ maxNumImages);
+ reader.setOnImageAvailableListener(listener, handler);
+ if (VERBOSE) Log.v(TAG, "Created ImageReader size " + size);
+ return reader;
+ }
+
+ /**
+ * Create an ImageWriter and hook up the ImageListener.
+ *
+ * @param inputSurface The input surface of the ImageWriter.
+ * @param maxImages The max number of Images that can be dequeued simultaneously.
+ * @param listener The listener used by this ImageWriter to notify callbacks
+ * @param handler The handler to post listener callbacks.
+ * @return ImageWriter object created.
+ */
+ public static ImageWriter makeImageWriter(
+ Surface inputSurface, int maxImages,
+ ImageWriter.OnImageReleasedListener listener, Handler handler) {
+ ImageWriter writer = ImageWriter.newInstance(inputSurface, maxImages);
+ writer.setOnImageReleasedListener(listener, handler);
+ return writer;
+ }
+
+ /**
+ * Close pending images and clean up an {@link ImageReader} object.
+ * @param reader an {@link ImageReader} to close.
+ */
+ public static void closeImageReader(ImageReader reader) {
+ if (reader != null) {
+ reader.close();
+ }
+ }
+
+ /**
+ * Close pending images and clean up an {@link ImageWriter} object.
+ * @param writer an {@link ImageWriter} to close.
+ */
+ public static void closeImageWriter(ImageWriter writer) {
+ if (writer != null) {
+ writer.close();
+ }
+ }
+
+ /**
+ * Dummy listener that release the image immediately once it is available.
+ *
+ * <p>
+ * It can be used for the case where we don't care the image data at all.
+ * </p>
+ */
+ public static class ImageDropperListener implements ImageReader.OnImageAvailableListener {
+ @Override
+ public void onImageAvailable(ImageReader reader) {
+ Image image = null;
+ try {
+ image = reader.acquireNextImage();
+ } finally {
+ if (image != null) {
+ image.close();
+ }
+ }
+ }
+ }
+
+ /**
+ * Image listener that release the image immediately after validating the image
+ */
+ public static class ImageVerifierListener implements ImageReader.OnImageAvailableListener {
+ private Size mSize;
+ private int mFormat;
+
+ public ImageVerifierListener(Size sz, int format) {
+ mSize = sz;
+ mFormat = format;
+ }
+
+ @Override
+ public void onImageAvailable(ImageReader reader) {
+ Image image = null;
+ try {
+ image = reader.acquireNextImage();
+ } finally {
+ if (image != null) {
+ validateImage(image, mSize.getWidth(), mSize.getHeight(), mFormat, null);
+ image.close();
+ }
+ }
+ }
+ }
+
+ public static class SimpleImageReaderListener
+ implements ImageReader.OnImageAvailableListener {
+ private final LinkedBlockingQueue<Image> mQueue =
+ new LinkedBlockingQueue<Image>();
+ // Indicate whether this listener will drop images or not,
+ // when the queued images reaches the reader maxImages
+ private final boolean mAsyncMode;
+ // maxImages held by the queue in async mode.
+ private final int mMaxImages;
+
+ /**
+ * Create a synchronous SimpleImageReaderListener that queues the images
+ * automatically when they are available, no image will be dropped. If
+ * the caller doesn't call getImage(), the producer will eventually run
+ * into buffer starvation.
+ */
+ public SimpleImageReaderListener() {
+ mAsyncMode = false;
+ mMaxImages = 0;
+ }
+
+ /**
+ * Create a synchronous/asynchronous SimpleImageReaderListener that
+ * queues the images automatically when they are available. For
+ * asynchronous listener, image will be dropped if the queued images
+ * reach to maxImages queued. If the caller doesn't call getImage(), the
+ * producer will not be blocked. For synchronous listener, no image will
+ * be dropped. If the caller doesn't call getImage(), the producer will
+ * eventually run into buffer starvation.
+ *
+ * @param asyncMode If the listener is operating at asynchronous mode.
+ * @param maxImages The max number of images held by this listener.
+ */
+ /**
+ *
+ * @param asyncMode
+ */
+ public SimpleImageReaderListener(boolean asyncMode, int maxImages) {
+ mAsyncMode = asyncMode;
+ mMaxImages = maxImages;
+ }
+
+ @Override
+ public void onImageAvailable(ImageReader reader) {
+ try {
+ mQueue.put(reader.acquireNextImage());
+ if (mAsyncMode && mQueue.size() >= mMaxImages) {
+ Image img = mQueue.poll();
+ img.close();
+ }
+ } catch (InterruptedException e) {
+ throw new UnsupportedOperationException(
+ "Can't handle InterruptedException in onImageAvailable");
+ }
+ }
+
+ /**
+ * Get an image from the image reader.
+ *
+ * @param timeout Timeout value for the wait.
+ * @return The image from the image reader.
+ */
+ public Image getImage(long timeout) throws InterruptedException {
+ Image image = mQueue.poll(timeout, TimeUnit.MILLISECONDS);
+ assertNotNull("Wait for an image timed out in " + timeout + "ms", image);
+ return image;
+ }
+
+ /**
+ * Drain the pending images held by this listener currently.
+ *
+ */
+ public void drain() {
+ while (!mQueue.isEmpty()) {
+ Image image = mQueue.poll();
+ assertNotNull("Unable to get an image", image);
+ image.close();
+ }
+ }
+ }
+
+ public static class SimpleImageWriterListener implements ImageWriter.OnImageReleasedListener {
+ private final Semaphore mImageReleasedSema = new Semaphore(0);
+ private final ImageWriter mWriter;
+ @Override
+ public void onImageReleased(ImageWriter writer) {
+ if (writer != mWriter) {
+ return;
+ }
+
+ if (VERBOSE) {
+ Log.v(TAG, "Input image is released");
+ }
+ mImageReleasedSema.release();
+ }
+
+ public SimpleImageWriterListener(ImageWriter writer) {
+ if (writer == null) {
+ throw new IllegalArgumentException("writer cannot be null");
+ }
+ mWriter = writer;
+ }
+
+ public void waitForImageReleased(long timeoutMs) throws InterruptedException {
+ if (!mImageReleasedSema.tryAcquire(timeoutMs, TimeUnit.MILLISECONDS)) {
+ fail("wait for image available timed out after " + timeoutMs + "ms");
+ }
+ }
+ }
+
+ public static class SimpleCaptureCallback extends CameraCaptureSession.CaptureCallback {
+ private final LinkedBlockingQueue<TotalCaptureResult> mQueue =
+ new LinkedBlockingQueue<TotalCaptureResult>();
+ private final LinkedBlockingQueue<CaptureFailure> mFailureQueue =
+ new LinkedBlockingQueue<>();
+ // Pair<CaptureRequest, Long> is a pair of capture request and timestamp.
+ private final LinkedBlockingQueue<Pair<CaptureRequest, Long>> mCaptureStartQueue =
+ new LinkedBlockingQueue<>();
+
+ private AtomicLong mNumFramesArrived = new AtomicLong(0);
+
+ @Override
+ public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request,
+ long timestamp, long frameNumber) {
+ try {
+ mCaptureStartQueue.put(new Pair(request, timestamp));
+ } catch (InterruptedException e) {
+ throw new UnsupportedOperationException(
+ "Can't handle InterruptedException in onCaptureStarted");
+ }
+ }
+
+ @Override
+ public void onCaptureCompleted(CameraCaptureSession session, CaptureRequest request,
+ TotalCaptureResult result) {
+ try {
+ mNumFramesArrived.incrementAndGet();
+ mQueue.put(result);
+ } catch (InterruptedException e) {
+ throw new UnsupportedOperationException(
+ "Can't handle InterruptedException in onCaptureCompleted");
+ }
+ }
+
+ @Override
+ public void onCaptureFailed(CameraCaptureSession session, CaptureRequest request,
+ CaptureFailure failure) {
+ try {
+ mFailureQueue.put(failure);
+ } catch (InterruptedException e) {
+ throw new UnsupportedOperationException(
+ "Can't handle InterruptedException in onCaptureFailed");
+ }
+ }
+
+ @Override
+ public void onCaptureSequenceCompleted(CameraCaptureSession session, int sequenceId,
+ long frameNumber) {
+ }
+
+ public long getTotalNumFrames() {
+ return mNumFramesArrived.get();
+ }
+
+ public CaptureResult getCaptureResult(long timeout) {
+ return getTotalCaptureResult(timeout);
+ }
+
+ public TotalCaptureResult getCaptureResult(long timeout, long timestamp) {
+ try {
+ long currentTs = -1L;
+ TotalCaptureResult result;
+ while (true) {
+ result = mQueue.poll(timeout, TimeUnit.MILLISECONDS);
+ if (result == null) {
+ throw new RuntimeException(
+ "Wait for a capture result timed out in " + timeout + "ms");
+ }
+ currentTs = result.get(CaptureResult.SENSOR_TIMESTAMP);
+ if (currentTs == timestamp) {
+ return result;
+ }
+ }
+
+ } catch (InterruptedException e) {
+ throw new UnsupportedOperationException("Unhandled interrupted exception", e);
+ }
+ }
+
+ public TotalCaptureResult getTotalCaptureResult(long timeout) {
+ try {
+ TotalCaptureResult result = mQueue.poll(timeout, TimeUnit.MILLISECONDS);
+ assertNotNull("Wait for a capture result timed out in " + timeout + "ms", result);
+ return result;
+ } catch (InterruptedException e) {
+ throw new UnsupportedOperationException("Unhandled interrupted exception", e);
+ }
+ }
+
+ /**
+ * Get the {@link #CaptureResult capture result} for a given
+ * {@link #CaptureRequest capture request}.
+ *
+ * @param myRequest The {@link #CaptureRequest capture request} whose
+ * corresponding {@link #CaptureResult capture result} was
+ * being waited for
+ * @param numResultsWait Number of frames to wait for the capture result
+ * before timeout.
+ * @throws TimeoutRuntimeException If more than numResultsWait results are
+ * seen before the result matching myRequest arrives, or each
+ * individual wait for result times out after
+ * {@value #CAPTURE_RESULT_TIMEOUT_MS}ms.
+ */
+ public CaptureResult getCaptureResultForRequest(CaptureRequest myRequest,
+ int numResultsWait) {
+ return getTotalCaptureResultForRequest(myRequest, numResultsWait);
+ }
+
+ /**
+ * Get the {@link #TotalCaptureResult total capture result} for a given
+ * {@link #CaptureRequest capture request}.
+ *
+ * @param myRequest The {@link #CaptureRequest capture request} whose
+ * corresponding {@link #TotalCaptureResult capture result} was
+ * being waited for
+ * @param numResultsWait Number of frames to wait for the capture result
+ * before timeout.
+ * @throws TimeoutRuntimeException If more than numResultsWait results are
+ * seen before the result matching myRequest arrives, or each
+ * individual wait for result times out after
+ * {@value #CAPTURE_RESULT_TIMEOUT_MS}ms.
+ */
+ public TotalCaptureResult getTotalCaptureResultForRequest(CaptureRequest myRequest,
+ int numResultsWait) {
+ ArrayList<CaptureRequest> captureRequests = new ArrayList<>(1);
+ captureRequests.add(myRequest);
+ return getTotalCaptureResultsForRequests(captureRequests, numResultsWait)[0];
+ }
+
+ /**
+ * Get an array of {@link #TotalCaptureResult total capture results} for a given list of
+ * {@link #CaptureRequest capture requests}. This can be used when the order of results
+ * may not the same as the order of requests.
+ *
+ * @param captureRequests The list of {@link #CaptureRequest capture requests} whose
+ * corresponding {@link #TotalCaptureResult capture results} are
+ * being waited for.
+ * @param numResultsWait Number of frames to wait for the capture results
+ * before timeout.
+ * @throws TimeoutRuntimeException If more than numResultsWait results are
+ * seen before all the results matching captureRequests arrives.
+ */
+ public TotalCaptureResult[] getTotalCaptureResultsForRequests(
+ List<CaptureRequest> captureRequests, int numResultsWait) {
+ if (numResultsWait < 0) {
+ throw new IllegalArgumentException("numResultsWait must be no less than 0");
+ }
+ if (captureRequests == null || captureRequests.size() == 0) {
+ throw new IllegalArgumentException("captureRequests must have at least 1 request.");
+ }
+
+ // Create a request -> a list of result indices map that it will wait for.
+ HashMap<CaptureRequest, ArrayList<Integer>> remainingResultIndicesMap = new HashMap<>();
+ for (int i = 0; i < captureRequests.size(); i++) {
+ CaptureRequest request = captureRequests.get(i);
+ ArrayList<Integer> indices = remainingResultIndicesMap.get(request);
+ if (indices == null) {
+ indices = new ArrayList<>();
+ remainingResultIndicesMap.put(request, indices);
+ }
+ indices.add(i);
+ }
+
+ TotalCaptureResult[] results = new TotalCaptureResult[captureRequests.size()];
+ int i = 0;
+ do {
+ TotalCaptureResult result = getTotalCaptureResult(CAPTURE_RESULT_TIMEOUT_MS);
+ CaptureRequest request = result.getRequest();
+ ArrayList<Integer> indices = remainingResultIndicesMap.get(request);
+ if (indices != null) {
+ results[indices.get(0)] = result;
+ indices.remove(0);
+
+ // Remove the entry if all results for this request has been fulfilled.
+ if (indices.isEmpty()) {
+ remainingResultIndicesMap.remove(request);
+ }
+ }
+
+ if (remainingResultIndicesMap.isEmpty()) {
+ return results;
+ }
+ } while (i++ < numResultsWait);
+
+ throw new TimeoutRuntimeException("Unable to get the expected capture result after "
+ + "waiting for " + numResultsWait + " results");
+ }
+
+ /**
+ * Get an array list of {@link #CaptureFailure capture failure} with maxNumFailures entries
+ * at most. If it times out before maxNumFailures failures are received, return the failures
+ * received so far.
+ *
+ * @param maxNumFailures The maximal number of failures to return. If it times out before
+ * the maximal number of failures are received, return the received
+ * failures so far.
+ * @throws UnsupportedOperationException If an error happens while waiting on the failure.
+ */
+ public ArrayList<CaptureFailure> getCaptureFailures(long maxNumFailures) {
+ ArrayList<CaptureFailure> failures = new ArrayList<>();
+ try {
+ for (int i = 0; i < maxNumFailures; i++) {
+ CaptureFailure failure = mFailureQueue.poll(CAPTURE_RESULT_TIMEOUT_MS,
+ TimeUnit.MILLISECONDS);
+ if (failure == null) {
+ // If waiting on a failure times out, return the failures so far.
+ break;
+ }
+ failures.add(failure);
+ }
+ } catch (InterruptedException e) {
+ throw new UnsupportedOperationException("Unhandled interrupted exception", e);
+ }
+
+ return failures;
+ }
+
+ /**
+ * Wait until the capture start of a request and expected timestamp arrives or it times
+ * out after a number of capture starts.
+ *
+ * @param request The request for the capture start to wait for.
+ * @param timestamp The timestamp for the capture start to wait for.
+ * @param numCaptureStartsWait The number of capture start events to wait for before timing
+ * out.
+ */
+ public void waitForCaptureStart(CaptureRequest request, Long timestamp,
+ int numCaptureStartsWait) throws Exception {
+ Pair<CaptureRequest, Long> expectedShutter = new Pair<>(request, timestamp);
+
+ int i = 0;
+ do {
+ Pair<CaptureRequest, Long> shutter = mCaptureStartQueue.poll(
+ CAPTURE_RESULT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+
+ if (shutter == null) {
+ throw new TimeoutRuntimeException("Unable to get any more capture start " +
+ "event after waiting for " + CAPTURE_RESULT_TIMEOUT_MS + " ms.");
+ } else if (expectedShutter.equals(shutter)) {
+ return;
+ }
+
+ } while (i++ < numCaptureStartsWait);
+
+ throw new TimeoutRuntimeException("Unable to get the expected capture start " +
+ "event after waiting for " + numCaptureStartsWait + " capture starts");
+ }
+
+ public boolean hasMoreResults()
+ {
+ return mQueue.isEmpty();
+ }
+
+ public void drain() {
+ mQueue.clear();
+ mNumFramesArrived.getAndSet(0);
+ mFailureQueue.clear();
+ mCaptureStartQueue.clear();
+ }
+ }
+
+ /**
+ * Block until the camera is opened.
+ *
+ * <p>Don't use this to test #onDisconnected/#onError since this will throw
+ * an AssertionError if it fails to open the camera device.</p>
+ *
+ * @return CameraDevice opened camera device
+ *
+ * @throws IllegalArgumentException
+ * If the handler is null, or if the handler's looper is current.
+ * @throws CameraAccessException
+ * If open fails immediately.
+ * @throws BlockingOpenException
+ * If open fails after blocking for some amount of time.
+ * @throws TimeoutRuntimeException
+ * If opening times out. Typically unrecoverable.
+ */
+ public static CameraDevice openCamera(CameraManager manager, String cameraId,
+ CameraDevice.StateCallback listener, Handler handler) throws CameraAccessException,
+ BlockingOpenException {
+
+ /**
+ * Although camera2 API allows 'null' Handler (it will just use the current
+ * thread's Looper), this is not what we want for CTS.
+ *
+ * In Camera framework test the default looper is used only to process events
+ * in between test runs,
+ * so anything sent there would not be executed inside a test and the test would fail.
+ *
+ * In this case, BlockingCameraManager#openCamera performs the check for us.
+ */
+ return (new BlockingCameraManager(manager)).openCamera(cameraId, listener, handler);
+ }
+
+
+ /**
+ * Block until the camera is opened.
+ *
+ * <p>Don't use this to test #onDisconnected/#onError since this will throw
+ * an AssertionError if it fails to open the camera device.</p>
+ *
+ * @throws IllegalArgumentException
+ * If the handler is null, or if the handler's looper is current.
+ * @throws CameraAccessException
+ * If open fails immediately.
+ * @throws BlockingOpenException
+ * If open fails after blocking for some amount of time.
+ * @throws TimeoutRuntimeException
+ * If opening times out. Typically unrecoverable.
+ */
+ public static CameraDevice openCamera(CameraManager manager, String cameraId, Handler handler)
+ throws CameraAccessException,
+ BlockingOpenException {
+ return openCamera(manager, cameraId, /*listener*/null, handler);
+ }
+
+ /**
+ * Configure a new camera session with output surfaces and type.
+ *
+ * @param camera The CameraDevice to be configured.
+ * @param outputSurfaces The surface list that used for camera output.
+ * @param listener The callback CameraDevice will notify when capture results are available.
+ */
+ public static CameraCaptureSession configureCameraSession(CameraDevice camera,
+ List<Surface> outputSurfaces, boolean isHighSpeed,
+ CameraCaptureSession.StateCallback listener, Handler handler)
+ throws CameraAccessException {
+ BlockingSessionCallback sessionListener = new BlockingSessionCallback(listener);
+ if (isHighSpeed) {
+ camera.createConstrainedHighSpeedCaptureSession(outputSurfaces,
+ sessionListener, handler);
+ } else {
+ camera.createCaptureSession(outputSurfaces, sessionListener, handler);
+ }
+ CameraCaptureSession session =
+ sessionListener.waitAndGetSession(SESSION_CONFIGURE_TIMEOUT_MS);
+ assertFalse("Camera session should not be a reprocessable session",
+ session.isReprocessable());
+ String sessionType = isHighSpeed ? "High Speed" : "Normal";
+ assertTrue("Capture session type must be " + sessionType,
+ isHighSpeed ==
+ CameraConstrainedHighSpeedCaptureSession.class.isAssignableFrom(session.getClass()));
+
+ return session;
+ }
+
+ /**
+ * Configure a new camera session with output surfaces.
+ *
+ * @param camera The CameraDevice to be configured.
+ * @param outputSurfaces The surface list that used for camera output.
+ * @param listener The callback CameraDevice will notify when capture results are available.
+ */
+ public static CameraCaptureSession configureCameraSession(CameraDevice camera,
+ List<Surface> outputSurfaces,
+ CameraCaptureSession.StateCallback listener, Handler handler)
+ throws CameraAccessException {
+
+ return configureCameraSession(camera, outputSurfaces, /*isHighSpeed*/false,
+ listener, handler);
+ }
+
+ public static CameraCaptureSession configureReprocessableCameraSession(CameraDevice camera,
+ InputConfiguration inputConfiguration, List<Surface> outputSurfaces,
+ CameraCaptureSession.StateCallback listener, Handler handler)
+ throws CameraAccessException {
+ BlockingSessionCallback sessionListener = new BlockingSessionCallback(listener);
+ camera.createReprocessableCaptureSession(inputConfiguration, outputSurfaces,
+ sessionListener, handler);
+
+ Integer[] sessionStates = {BlockingSessionCallback.SESSION_READY,
+ BlockingSessionCallback.SESSION_CONFIGURE_FAILED};
+ int state = sessionListener.getStateWaiter().waitForAnyOfStates(
+ Arrays.asList(sessionStates), SESSION_CONFIGURE_TIMEOUT_MS);
+
+ assertTrue("Creating a reprocessable session failed.",
+ state == BlockingSessionCallback.SESSION_READY);
+
+ CameraCaptureSession session =
+ sessionListener.waitAndGetSession(SESSION_CONFIGURE_TIMEOUT_MS);
+ assertTrue("Camera session should be a reprocessable session", session.isReprocessable());
+
+ return session;
+ }
+
+ public static <T> void assertArrayNotEmpty(T arr, String message) {
+ assertTrue(message, arr != null && Array.getLength(arr) > 0);
+ }
+
+ /**
+ * Check if the format is a legal YUV format camera supported.
+ */
+ public static void checkYuvFormat(int format) {
+ if ((format != ImageFormat.YUV_420_888) &&
+ (format != ImageFormat.NV21) &&
+ (format != ImageFormat.YV12)) {
+ fail("Wrong formats: " + format);
+ }
+ }
+
+ /**
+ * Check if image size and format match given size and format.
+ */
+ public static void checkImage(Image image, int width, int height, int format) {
+ // Image reader will wrap YV12/NV21 image by YUV_420_888
+ if (format == ImageFormat.NV21 || format == ImageFormat.YV12) {
+ format = ImageFormat.YUV_420_888;
+ }
+ assertNotNull("Input image is invalid", image);
+ assertEquals("Format doesn't match", format, image.getFormat());
+ assertEquals("Width doesn't match", width, image.getWidth());
+ assertEquals("Height doesn't match", height, image.getHeight());
+ }
+
+ /**
+ * <p>Read data from all planes of an Image into a contiguous unpadded, unpacked
+ * 1-D linear byte array, such that it can be write into disk, or accessed by
+ * software conveniently. It supports YUV_420_888/NV21/YV12 and JPEG input
+ * Image format.</p>
+ *
+ * <p>For YUV_420_888/NV21/YV12/Y8/Y16, it returns a byte array that contains
+ * the Y plane data first, followed by U(Cb), V(Cr) planes if there is any
+ * (xstride = width, ystride = height for chroma and luma components).</p>
+ *
+ * <p>For JPEG, it returns a 1-D byte array contains a complete JPEG image.</p>
+ */
+ public static byte[] getDataFromImage(Image image) {
+ assertNotNull("Invalid image:", image);
+ int format = image.getFormat();
+ int width = image.getWidth();
+ int height = image.getHeight();
+ int rowStride, pixelStride;
+ byte[] data = null;
+
+ // Read image data
+ Plane[] planes = image.getPlanes();
+ assertTrue("Fail to get image planes", planes != null && planes.length > 0);
+
+ // Check image validity
+ checkAndroidImageFormat(image);
+
+ ByteBuffer buffer = null;
+ // JPEG doesn't have pixelstride and rowstride, treat it as 1D buffer.
+ // Same goes for DEPTH_POINT_CLOUD
+ if (format == ImageFormat.JPEG || format == ImageFormat.DEPTH_POINT_CLOUD ||
+ format == ImageFormat.RAW_PRIVATE) {
+ buffer = planes[0].getBuffer();
+ assertNotNull("Fail to get jpeg or depth ByteBuffer", buffer);
+ data = new byte[buffer.remaining()];
+ buffer.get(data);
+ buffer.rewind();
+ return data;
+ }
+
+ int offset = 0;
+ data = new byte[width * height * ImageFormat.getBitsPerPixel(format) / 8];
+ int maxRowSize = planes[0].getRowStride();
+ for (int i = 0; i < planes.length; i++) {
+ if (maxRowSize < planes[i].getRowStride()) {
+ maxRowSize = planes[i].getRowStride();
+ }
+ }
+ byte[] rowData = new byte[maxRowSize];
+ if(VERBOSE) Log.v(TAG, "get data from " + planes.length + " planes");
+ for (int i = 0; i < planes.length; i++) {
+ buffer = planes[i].getBuffer();
+ assertNotNull("Fail to get bytebuffer from plane", buffer);
+ rowStride = planes[i].getRowStride();
+ pixelStride = planes[i].getPixelStride();
+ assertTrue("pixel stride " + pixelStride + " is invalid", pixelStride > 0);
+ if (VERBOSE) {
+ Log.v(TAG, "pixelStride " + pixelStride);
+ Log.v(TAG, "rowStride " + rowStride);
+ Log.v(TAG, "width " + width);
+ Log.v(TAG, "height " + height);
+ }
+ // For multi-planar yuv images, assuming yuv420 with 2x2 chroma subsampling.
+ int w = (i == 0) ? width : width / 2;
+ int h = (i == 0) ? height : height / 2;
+ assertTrue("rowStride " + rowStride + " should be >= width " + w , rowStride >= w);
+ for (int row = 0; row < h; row++) {
+ int bytesPerPixel = ImageFormat.getBitsPerPixel(format) / 8;
+ int length;
+ if (pixelStride == bytesPerPixel) {
+ // Special case: optimized read of the entire row
+ length = w * bytesPerPixel;
+ buffer.get(data, offset, length);
+ offset += length;
+ } else {
+ // Generic case: should work for any pixelStride but slower.
+ // Use intermediate buffer to avoid read byte-by-byte from
+ // DirectByteBuffer, which is very bad for performance
+ length = (w - 1) * pixelStride + bytesPerPixel;
+ buffer.get(rowData, 0, length);
+ for (int col = 0; col < w; col++) {
+ data[offset++] = rowData[col * pixelStride];
+ }
+ }
+ // Advance buffer the remainder of the row stride
+ if (row < h - 1) {
+ buffer.position(buffer.position() + rowStride - length);
+ }
+ }
+ if (VERBOSE) Log.v(TAG, "Finished reading data from plane " + i);
+ buffer.rewind();
+ }
+ return data;
+ }
+
+ /**
+ * <p>Check android image format validity for an image, only support below formats:</p>
+ *
+ * <p>YUV_420_888/NV21/YV12, can add more for future</p>
+ */
+ public static void checkAndroidImageFormat(Image image) {
+ int format = image.getFormat();
+ Plane[] planes = image.getPlanes();
+ switch (format) {
+ case ImageFormat.YUV_420_888:
+ case ImageFormat.NV21:
+ case ImageFormat.YV12:
+ assertEquals("YUV420 format Images should have 3 planes", 3, planes.length);
+ break;
+ case ImageFormat.JPEG:
+ case ImageFormat.RAW_SENSOR:
+ case ImageFormat.RAW_PRIVATE:
+ case ImageFormat.DEPTH16:
+ case ImageFormat.DEPTH_POINT_CLOUD:
+ assertEquals("JPEG/RAW/depth Images should have one plane", 1, planes.length);
+ break;
+ default:
+ fail("Unsupported Image Format: " + format);
+ }
+ }
+
+ public static void dumpFile(String fileName, Bitmap data) {
+ FileOutputStream outStream;
+ try {
+ Log.v(TAG, "output will be saved as " + fileName);
+ outStream = new FileOutputStream(fileName);
+ } catch (IOException ioe) {
+ throw new RuntimeException("Unable to create debug output file " + fileName, ioe);
+ }
+
+ try {
+ data.compress(Bitmap.CompressFormat.JPEG, /*quality*/90, outStream);
+ outStream.close();
+ } catch (IOException ioe) {
+ throw new RuntimeException("failed writing data to file " + fileName, ioe);
+ }
+ }
+
+ public static void dumpFile(String fileName, byte[] data) {
+ FileOutputStream outStream;
+ try {
+ Log.v(TAG, "output will be saved as " + fileName);
+ outStream = new FileOutputStream(fileName);
+ } catch (IOException ioe) {
+ throw new RuntimeException("Unable to create debug output file " + fileName, ioe);
+ }
+
+ try {
+ outStream.write(data);
+ outStream.close();
+ } catch (IOException ioe) {
+ throw new RuntimeException("failed writing data to file " + fileName, ioe);
+ }
+ }
+
+ /**
+ * Get the available output sizes for the user-defined {@code format}.
+ *
+ * <p>Note that implementation-defined/hidden formats are not supported.</p>
+ */
+ public static Size[] getSupportedSizeForFormat(int format, String cameraId,
+ CameraManager cameraManager) throws CameraAccessException {
+ CameraCharacteristics properties = cameraManager.getCameraCharacteristics(cameraId);
+ assertNotNull("Can't get camera characteristics!", properties);
+ if (VERBOSE) {
+ Log.v(TAG, "get camera characteristics for camera: " + cameraId);
+ }
+ StreamConfigurationMap configMap =
+ properties.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+ Size[] availableSizes = configMap.getOutputSizes(format);
+ assertArrayNotEmpty(availableSizes, "availableSizes should not be empty for format: "
+ + format);
+ Size[] highResAvailableSizes = configMap.getHighResolutionOutputSizes(format);
+ if (highResAvailableSizes != null && highResAvailableSizes.length > 0) {
+ Size[] allSizes = new Size[availableSizes.length + highResAvailableSizes.length];
+ System.arraycopy(availableSizes, 0, allSizes, 0,
+ availableSizes.length);
+ System.arraycopy(highResAvailableSizes, 0, allSizes, availableSizes.length,
+ highResAvailableSizes.length);
+ availableSizes = allSizes;
+ }
+ if (VERBOSE) Log.v(TAG, "Supported sizes are: " + Arrays.deepToString(availableSizes));
+ return availableSizes;
+ }
+
+ /**
+ * Get the available output sizes for the given class.
+ *
+ */
+ public static Size[] getSupportedSizeForClass(Class klass, String cameraId,
+ CameraManager cameraManager) throws CameraAccessException {
+ CameraCharacteristics properties = cameraManager.getCameraCharacteristics(cameraId);
+ assertNotNull("Can't get camera characteristics!", properties);
+ if (VERBOSE) {
+ Log.v(TAG, "get camera characteristics for camera: " + cameraId);
+ }
+ StreamConfigurationMap configMap =
+ properties.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+ Size[] availableSizes = configMap.getOutputSizes(klass);
+ assertArrayNotEmpty(availableSizes, "availableSizes should not be empty for class: "
+ + klass);
+ Size[] highResAvailableSizes = configMap.getHighResolutionOutputSizes(ImageFormat.PRIVATE);
+ if (highResAvailableSizes != null && highResAvailableSizes.length > 0) {
+ Size[] allSizes = new Size[availableSizes.length + highResAvailableSizes.length];
+ System.arraycopy(availableSizes, 0, allSizes, 0,
+ availableSizes.length);
+ System.arraycopy(highResAvailableSizes, 0, allSizes, availableSizes.length,
+ highResAvailableSizes.length);
+ availableSizes = allSizes;
+ }
+ if (VERBOSE) Log.v(TAG, "Supported sizes are: " + Arrays.deepToString(availableSizes));
+ return availableSizes;
+ }
+
+ /**
+ * Size comparator that compares the number of pixels it covers.
+ *
+ * <p>If two the areas of two sizes are same, compare the widths.</p>
+ */
+ public static class SizeComparator implements Comparator<Size> {
+ @Override
+ public int compare(Size lhs, Size rhs) {
+ return CameraUtils
+ .compareSizes(lhs.getWidth(), lhs.getHeight(), rhs.getWidth(), rhs.getHeight());
+ }
+ }
+
+ /**
+ * Get sorted size list in descending order. Remove the sizes larger than
+ * the bound. If the bound is null, don't do the size bound filtering.
+ */
+ static public List<Size> getSupportedPreviewSizes(String cameraId,
+ CameraManager cameraManager, Size bound) throws CameraAccessException {
+
+ Size[] rawSizes = getSupportedSizeForClass(android.view.SurfaceHolder.class, cameraId,
+ cameraManager);
+ assertArrayNotEmpty(rawSizes,
+ "Available sizes for SurfaceHolder class should not be empty");
+ if (VERBOSE) {
+ Log.v(TAG, "Supported sizes are: " + Arrays.deepToString(rawSizes));
+ }
+
+ if (bound == null) {
+ return getAscendingOrderSizes(Arrays.asList(rawSizes), /*ascending*/false);
+ }
+
+ List<Size> sizes = new ArrayList<Size>();
+ for (Size sz: rawSizes) {
+ if (sz.getWidth() <= bound.getWidth() && sz.getHeight() <= bound.getHeight()) {
+ sizes.add(sz);
+ }
+ }
+ return getAscendingOrderSizes(sizes, /*ascending*/false);
+ }
+
+ /**
+ * Get a sorted list of sizes from a given size list.
+ *
+ * <p>
+ * The size is compare by area it covers, if the areas are same, then
+ * compare the widths.
+ * </p>
+ *
+ * @param sizeList The input size list to be sorted
+ * @param ascending True if the order is ascending, otherwise descending order
+ * @return The ordered list of sizes
+ */
+ static public List<Size> getAscendingOrderSizes(final List<Size> sizeList, boolean ascending) {
+ if (sizeList == null) {
+ throw new IllegalArgumentException("sizeList shouldn't be null");
+ }
+
+ Comparator<Size> comparator = new SizeComparator();
+ List<Size> sortedSizes = new ArrayList<Size>();
+ sortedSizes.addAll(sizeList);
+ Collections.sort(sortedSizes, comparator);
+ if (!ascending) {
+ Collections.reverse(sortedSizes);
+ }
+
+ return sortedSizes;
+ }
+
+ /**
+ * Get sorted (descending order) size list for given format. Remove the sizes larger than
+ * the bound. If the bound is null, don't do the size bound filtering.
+ */
+ static public List<Size> getSortedSizesForFormat(String cameraId,
+ CameraManager cameraManager, int format, Size bound) throws CameraAccessException {
+ Comparator<Size> comparator = new SizeComparator();
+ Size[] sizes = getSupportedSizeForFormat(format, cameraId, cameraManager);
+ List<Size> sortedSizes = null;
+ if (bound != null) {
+ sortedSizes = new ArrayList<Size>(/*capacity*/1);
+ for (Size sz : sizes) {
+ if (comparator.compare(sz, bound) <= 0) {
+ sortedSizes.add(sz);
+ }
+ }
+ } else {
+ sortedSizes = Arrays.asList(sizes);
+ }
+ assertTrue("Supported size list should have at least one element",
+ sortedSizes.size() > 0);
+
+ Collections.sort(sortedSizes, comparator);
+ // Make it in descending order.
+ Collections.reverse(sortedSizes);
+ return sortedSizes;
+ }
+
+ /**
+ * Get supported video size list for a given camera device.
+ *
+ * <p>
+ * Filter out the sizes that are larger than the bound. If the bound is
+ * null, don't do the size bound filtering.
+ * </p>
+ */
+ static public List<Size> getSupportedVideoSizes(String cameraId,
+ CameraManager cameraManager, Size bound) throws CameraAccessException {
+
+ Size[] rawSizes = getSupportedSizeForClass(android.media.MediaRecorder.class,
+ cameraId, cameraManager);
+ assertArrayNotEmpty(rawSizes,
+ "Available sizes for MediaRecorder class should not be empty");
+ if (VERBOSE) {
+ Log.v(TAG, "Supported sizes are: " + Arrays.deepToString(rawSizes));
+ }
+
+ if (bound == null) {
+ return getAscendingOrderSizes(Arrays.asList(rawSizes), /*ascending*/false);
+ }
+
+ List<Size> sizes = new ArrayList<Size>();
+ for (Size sz: rawSizes) {
+ if (sz.getWidth() <= bound.getWidth() && sz.getHeight() <= bound.getHeight()) {
+ sizes.add(sz);
+ }
+ }
+ return getAscendingOrderSizes(sizes, /*ascending*/false);
+ }
+
+ /**
+ * Get supported video size list (descending order) for a given camera device.
+ *
+ * <p>
+ * Filter out the sizes that are larger than the bound. If the bound is
+ * null, don't do the size bound filtering.
+ * </p>
+ */
+ static public List<Size> getSupportedStillSizes(String cameraId,
+ CameraManager cameraManager, Size bound) throws CameraAccessException {
+ return getSortedSizesForFormat(cameraId, cameraManager, ImageFormat.JPEG, bound);
+ }
+
+ static public Size getMinPreviewSize(String cameraId, CameraManager cameraManager)
+ throws CameraAccessException {
+ List<Size> sizes = getSupportedPreviewSizes(cameraId, cameraManager, null);
+ return sizes.get(sizes.size() - 1);
+ }
+
+ /**
+ * Get max supported preview size for a camera device.
+ */
+ static public Size getMaxPreviewSize(String cameraId, CameraManager cameraManager)
+ throws CameraAccessException {
+ return getMaxPreviewSize(cameraId, cameraManager, /*bound*/null);
+ }
+
+ /**
+ * Get max preview size for a camera device in the supported sizes that are no larger
+ * than the bound.
+ */
+ static public Size getMaxPreviewSize(String cameraId, CameraManager cameraManager, Size bound)
+ throws CameraAccessException {
+ List<Size> sizes = getSupportedPreviewSizes(cameraId, cameraManager, bound);
+ return sizes.get(0);
+ }
+
+ /**
+ * Get max depth size for a camera device.
+ */
+ static public Size getMaxDepthSize(String cameraId, CameraManager cameraManager)
+ throws CameraAccessException {
+ List<Size> sizes = getSortedSizesForFormat(cameraId, cameraManager, ImageFormat.DEPTH16,
+ /*bound*/ null);
+ return sizes.get(0);
+ }
+
+ /**
+ * Get the largest size by area.
+ *
+ * @param sizes an array of sizes, must have at least 1 element
+ *
+ * @return Largest Size
+ *
+ * @throws IllegalArgumentException if sizes was null or had 0 elements
+ */
+ public static Size getMaxSize(Size... sizes) {
+ if (sizes == null || sizes.length == 0) {
+ throw new IllegalArgumentException("sizes was empty");
+ }
+
+ Size sz = sizes[0];
+ for (Size size : sizes) {
+ if (size.getWidth() * size.getHeight() > sz.getWidth() * sz.getHeight()) {
+ sz = size;
+ }
+ }
+
+ return sz;
+ }
+
+ /**
+ * Returns true if the given {@code array} contains the given element.
+ *
+ * @param array {@code array} to check for {@code elem}
+ * @param elem {@code elem} to test for
+ * @return {@code true} if the given element is contained
+ */
+ public static boolean contains(int[] array, int elem) {
+ if (array == null) return false;
+ for (int i = 0; i < array.length; i++) {
+ if (elem == array[i]) return true;
+ }
+ return false;
+ }
+
+ /**
+ * Get object array from byte array.
+ *
+ * @param array Input byte array to be converted
+ * @return Byte object array converted from input byte array
+ */
+ public static Byte[] toObject(byte[] array) {
+ return convertPrimitiveArrayToObjectArray(array, Byte.class);
+ }
+
+ /**
+ * Get object array from int array.
+ *
+ * @param array Input int array to be converted
+ * @return Integer object array converted from input int array
+ */
+ public static Integer[] toObject(int[] array) {
+ return convertPrimitiveArrayToObjectArray(array, Integer.class);
+ }
+
+ /**
+ * Get object array from float array.
+ *
+ * @param array Input float array to be converted
+ * @return Float object array converted from input float array
+ */
+ public static Float[] toObject(float[] array) {
+ return convertPrimitiveArrayToObjectArray(array, Float.class);
+ }
+
+ /**
+ * Get object array from double array.
+ *
+ * @param array Input double array to be converted
+ * @return Double object array converted from input double array
+ */
+ public static Double[] toObject(double[] array) {
+ return convertPrimitiveArrayToObjectArray(array, Double.class);
+ }
+
+ /**
+ * Convert a primitive input array into its object array version (e.g. from int[] to Integer[]).
+ *
+ * @param array Input array object
+ * @param wrapperClass The boxed class it converts to
+ * @return Boxed version of primitive array
+ */
+ private static <T> T[] convertPrimitiveArrayToObjectArray(final Object array,
+ final Class<T> wrapperClass) {
+ // getLength does the null check and isArray check already.
+ int arrayLength = Array.getLength(array);
+ if (arrayLength == 0) {
+ throw new IllegalArgumentException("Input array shouldn't be empty");
+ }
+
+ @SuppressWarnings("unchecked")
+ final T[] result = (T[]) Array.newInstance(wrapperClass, arrayLength);
+ for (int i = 0; i < arrayLength; i++) {
+ Array.set(result, i, Array.get(array, i));
+ }
+ return result;
+ }
+
+ /**
+ * Validate image based on format and size.
+ *
+ * @param image The image to be validated.
+ * @param width The image width.
+ * @param height The image height.
+ * @param format The image format.
+ * @param filePath The debug dump file path, null if don't want to dump to
+ * file.
+ * @throws UnsupportedOperationException if calling with an unknown format
+ */
+ public static void validateImage(Image image, int width, int height, int format,
+ String filePath) {
+ checkImage(image, width, height, format);
+
+ /**
+ * TODO: validate timestamp:
+ * 1. capture result timestamp against the image timestamp (need
+ * consider frame drops)
+ * 2. timestamps should be monotonically increasing for different requests
+ */
+ if(VERBOSE) Log.v(TAG, "validating Image");
+ byte[] data = getDataFromImage(image);
+ assertTrue("Invalid image data", data != null && data.length > 0);
+
+ switch (format) {
+ case ImageFormat.JPEG:
+ validateJpegData(data, width, height, filePath);
+ break;
+ case ImageFormat.YUV_420_888:
+ case ImageFormat.YV12:
+ validateYuvData(data, width, height, format, image.getTimestamp(), filePath);
+ break;
+ case ImageFormat.RAW_SENSOR:
+ validateRaw16Data(data, width, height, format, image.getTimestamp(), filePath);
+ break;
+ case ImageFormat.DEPTH16:
+ validateDepth16Data(data, width, height, format, image.getTimestamp(), filePath);
+ break;
+ case ImageFormat.DEPTH_POINT_CLOUD:
+ validateDepthPointCloudData(data, width, height, format, image.getTimestamp(), filePath);
+ break;
+ case ImageFormat.RAW_PRIVATE:
+ validateRawPrivateData(data, width, height, image.getTimestamp(), filePath);
+ break;
+ default:
+ throw new UnsupportedOperationException("Unsupported format for validation: "
+ + format);
+ }
+ }
+
+ /**
+ * Provide a mock for {@link CameraDevice.StateCallback}.
+ *
+ * <p>Only useful because mockito can't mock {@link CameraDevice.StateCallback} which is an
+ * abstract class.</p>
+ *
+ * <p>
+ * Use this instead of other classes when needing to verify interactions, since
+ * trying to spy on {@link BlockingStateCallback} (or others) will cause unnecessary extra
+ * interactions which will cause false test failures.
+ * </p>
+ *
+ */
+ public static class MockStateCallback extends CameraDevice.StateCallback {
+
+ @Override
+ public void onOpened(CameraDevice camera) {
+ }
+
+ @Override
+ public void onDisconnected(CameraDevice camera) {
+ }
+
+ @Override
+ public void onError(CameraDevice camera, int error) {
+ }
+
+ private MockStateCallback() {}
+
+ /**
+ * Create a Mockito-ready mocked StateCallback.
+ */
+ public static MockStateCallback mock() {
+ return Mockito.spy(new MockStateCallback());
+ }
+ }
+
+ private static void validateJpegData(byte[] jpegData, int width, int height, String filePath) {
+ BitmapFactory.Options bmpOptions = new BitmapFactory.Options();
+ // DecodeBound mode: only parse the frame header to get width/height.
+ // it doesn't decode the pixel.
+ bmpOptions.inJustDecodeBounds = true;
+ BitmapFactory.decodeByteArray(jpegData, 0, jpegData.length, bmpOptions);
+ assertEquals(width, bmpOptions.outWidth);
+ assertEquals(height, bmpOptions.outHeight);
+
+ // Pixel decoding mode: decode whole image. check if the image data
+ // is decodable here.
+ assertNotNull("Decoding jpeg failed",
+ BitmapFactory.decodeByteArray(jpegData, 0, jpegData.length));
+ if (DEBUG && filePath != null) {
+ String fileName =
+ filePath + "/" + width + "x" + height + ".jpeg";
+ dumpFile(fileName, jpegData);
+ }
+ }
+
+ private static void validateYuvData(byte[] yuvData, int width, int height, int format,
+ long ts, String filePath) {
+ checkYuvFormat(format);
+ if (VERBOSE) Log.v(TAG, "Validating YUV data");
+ int expectedSize = width * height * ImageFormat.getBitsPerPixel(format) / 8;
+ assertEquals("Yuv data doesn't match", expectedSize, yuvData.length);
+
+ // TODO: Can add data validation for test pattern.
+
+ if (DEBUG && filePath != null) {
+ String fileName =
+ filePath + "/" + width + "x" + height + "_" + ts / 1e6 + ".yuv";
+ dumpFile(fileName, yuvData);
+ }
+ }
+
+ private static void validateRaw16Data(byte[] rawData, int width, int height, int format,
+ long ts, String filePath) {
+ if (VERBOSE) Log.v(TAG, "Validating raw data");
+ int expectedSize = width * height * ImageFormat.getBitsPerPixel(format) / 8;
+ assertEquals("Raw data doesn't match", expectedSize, rawData.length);
+
+ // TODO: Can add data validation for test pattern.
+
+ if (DEBUG && filePath != null) {
+ String fileName =
+ filePath + "/" + width + "x" + height + "_" + ts / 1e6 + ".raw16";
+ dumpFile(fileName, rawData);
+ }
+
+ return;
+ }
+
+ private static void validateRawPrivateData(byte[] rawData, int width, int height,
+ long ts, String filePath) {
+ if (VERBOSE) Log.v(TAG, "Validating private raw data");
+ // Expect each RAW pixel should occupy at least one byte and no more than 2.5 bytes
+ int expectedSizeMin = width * height;
+ int expectedSizeMax = width * height * 5 / 2;
+
+ assertTrue("Opaque RAW size " + rawData.length + "out of normal bound [" +
+ expectedSizeMin + "," + expectedSizeMax + "]",
+ expectedSizeMin <= rawData.length && rawData.length <= expectedSizeMax);
+
+ if (DEBUG && filePath != null) {
+ String fileName =
+ filePath + "/" + width + "x" + height + "_" + ts / 1e6 + ".rawPriv";
+ dumpFile(fileName, rawData);
+ }
+
+ return;
+ }
+
+ private static void validateDepth16Data(byte[] depthData, int width, int height, int format,
+ long ts, String filePath) {
+
+ if (VERBOSE) Log.v(TAG, "Validating depth16 data");
+ int expectedSize = width * height * ImageFormat.getBitsPerPixel(format) / 8;
+ assertEquals("Depth data doesn't match", expectedSize, depthData.length);
+
+
+ if (DEBUG && filePath != null) {
+ String fileName =
+ filePath + "/" + width + "x" + height + "_" + ts / 1e6 + ".depth16";
+ dumpFile(fileName, depthData);
+ }
+
+ return;
+
+ }
+
+ private static void validateDepthPointCloudData(byte[] depthData, int width, int height, int format,
+ long ts, String filePath) {
+
+ if (VERBOSE) Log.v(TAG, "Validating depth point cloud data");
+
+ // Can't validate size since it is variable
+
+ if (DEBUG && filePath != null) {
+ String fileName =
+ filePath + "/" + width + "x" + height + "_" + ts / 1e6 + ".depth_point_cloud";
+ dumpFile(fileName, depthData);
+ }
+
+ return;
+
+ }
+
+ public static <T> T getValueNotNull(CaptureResult result, CaptureResult.Key<T> key) {
+ if (result == null) {
+ throw new IllegalArgumentException("Result must not be null");
+ }
+
+ T value = result.get(key);
+ assertNotNull("Value of Key " + key.getName() + "shouldn't be null", value);
+ return value;
+ }
+
+ public static <T> T getValueNotNull(CameraCharacteristics characteristics,
+ CameraCharacteristics.Key<T> key) {
+ if (characteristics == null) {
+ throw new IllegalArgumentException("Camera characteristics must not be null");
+ }
+
+ T value = characteristics.get(key);
+ assertNotNull("Value of Key " + key.getName() + "shouldn't be null", value);
+ return value;
+ }
+
+ /**
+ * Get a crop region for a given zoom factor and center position.
+ * <p>
+ * The center position is normalized position in range of [0, 1.0], where
+ * (0, 0) represents top left corner, (1.0. 1.0) represents bottom right
+ * corner. The center position could limit the effective minimal zoom
+ * factor, for example, if the center position is (0.75, 0.75), the
+ * effective minimal zoom position becomes 2.0. If the requested zoom factor
+ * is smaller than 2.0, a crop region with 2.0 zoom factor will be returned.
+ * </p>
+ * <p>
+ * The aspect ratio of the crop region is maintained the same as the aspect
+ * ratio of active array.
+ * </p>
+ *
+ * @param zoomFactor The zoom factor to generate the crop region, it must be
+ * >= 1.0
+ * @param center The normalized zoom center point that is in the range of [0, 1].
+ * @param maxZoom The max zoom factor supported by this device.
+ * @param activeArray The active array size of this device.
+ * @return crop region for the given normalized center and zoom factor.
+ */
+ public static Rect getCropRegionForZoom(float zoomFactor, final PointF center,
+ final float maxZoom, final Rect activeArray) {
+ if (zoomFactor < 1.0) {
+ throw new IllegalArgumentException("zoom factor " + zoomFactor + " should be >= 1.0");
+ }
+ if (center.x > 1.0 || center.x < 0) {
+ throw new IllegalArgumentException("center.x " + center.x
+ + " should be in range of [0, 1.0]");
+ }
+ if (center.y > 1.0 || center.y < 0) {
+ throw new IllegalArgumentException("center.y " + center.y
+ + " should be in range of [0, 1.0]");
+ }
+ if (maxZoom < 1.0) {
+ throw new IllegalArgumentException("max zoom factor " + maxZoom + " should be >= 1.0");
+ }
+ if (activeArray == null) {
+ throw new IllegalArgumentException("activeArray must not be null");
+ }
+
+ float minCenterLength = Math.min(Math.min(center.x, 1.0f - center.x),
+ Math.min(center.y, 1.0f - center.y));
+ float minEffectiveZoom = 0.5f / minCenterLength;
+ if (minEffectiveZoom > maxZoom) {
+ throw new IllegalArgumentException("Requested center " + center.toString() +
+ " has minimal zoomable factor " + minEffectiveZoom + ", which exceeds max"
+ + " zoom factor " + maxZoom);
+ }
+
+ if (zoomFactor < minEffectiveZoom) {
+ Log.w(TAG, "Requested zoomFactor " + zoomFactor + " > minimal zoomable factor "
+ + minEffectiveZoom + ". It will be overwritten by " + minEffectiveZoom);
+ zoomFactor = minEffectiveZoom;
+ }
+
+ int cropCenterX = (int)(activeArray.width() * center.x);
+ int cropCenterY = (int)(activeArray.height() * center.y);
+ int cropWidth = (int) (activeArray.width() / zoomFactor);
+ int cropHeight = (int) (activeArray.height() / zoomFactor);
+
+ return new Rect(
+ /*left*/cropCenterX - cropWidth / 2,
+ /*top*/cropCenterY - cropHeight / 2,
+ /*right*/ cropCenterX + cropWidth / 2 - 1,
+ /*bottom*/cropCenterY + cropHeight / 2 - 1);
+ }
+
+ /**
+ * Calculate output 3A region from the intersection of input 3A region and cropped region.
+ *
+ * @param requestRegions The input 3A regions
+ * @param cropRect The cropped region
+ * @return expected 3A regions output in capture result
+ */
+ public static MeteringRectangle[] getExpectedOutputRegion(
+ MeteringRectangle[] requestRegions, Rect cropRect){
+ MeteringRectangle[] resultRegions = new MeteringRectangle[requestRegions.length];
+ for (int i = 0; i < requestRegions.length; i++) {
+ Rect requestRect = requestRegions[i].getRect();
+ Rect resultRect = new Rect();
+ assertTrue("Input 3A region must intersect cropped region",
+ resultRect.setIntersect(requestRect, cropRect));
+ resultRegions[i] = new MeteringRectangle(
+ resultRect,
+ requestRegions[i].getMeteringWeight());
+ }
+ return resultRegions;
+ }
+
+ /**
+ * Copy source image data to destination image.
+ *
+ * @param src The source image to be copied from.
+ * @param dst The destination image to be copied to.
+ * @throws IllegalArgumentException If the source and destination images have
+ * different format, or one of the images is not copyable.
+ */
+ public static void imageCopy(Image src, Image dst) {
+ if (src == null || dst == null) {
+ throw new IllegalArgumentException("Images should be non-null");
+ }
+ if (src.getFormat() != dst.getFormat()) {
+ throw new IllegalArgumentException("Src and dst images should have the same format");
+ }
+ if (src.getFormat() == ImageFormat.PRIVATE ||
+ dst.getFormat() == ImageFormat.PRIVATE) {
+ throw new IllegalArgumentException("PRIVATE format images are not copyable");
+ }
+
+ // TODO: check the owner of the dst image, it must be from ImageWriter, other source may
+ // not be writable. Maybe we should add an isWritable() method in image class.
+
+ Plane[] srcPlanes = src.getPlanes();
+ Plane[] dstPlanes = dst.getPlanes();
+ ByteBuffer srcBuffer = null;
+ ByteBuffer dstBuffer = null;
+ for (int i = 0; i < srcPlanes.length; i++) {
+ srcBuffer = srcPlanes[i].getBuffer();
+ int srcPos = srcBuffer.position();
+ srcBuffer.rewind();
+ dstBuffer = dstPlanes[i].getBuffer();
+ dstBuffer.rewind();
+ dstBuffer.put(srcBuffer);
+ srcBuffer.position(srcPos);
+ dstBuffer.rewind();
+ }
+ }
+
+ /**
+ * <p>
+ * Checks whether the two images are strongly equal.
+ * </p>
+ * <p>
+ * Two images are strongly equal if and only if the data, formats, sizes,
+ * and timestamps are same. For {@link ImageFormat#PRIVATE PRIVATE} format
+ * images, the image data is not not accessible thus the data comparison is
+ * effectively skipped as the number of planes is zero.
+ * </p>
+ * <p>
+ * Note that this method compares the pixel data even outside of the crop
+ * region, which may not be necessary for general use case.
+ * </p>
+ *
+ * @param lhsImg First image to be compared with.
+ * @param rhsImg Second image to be compared with.
+ * @return true if the two images are equal, false otherwise.
+ * @throws IllegalArgumentException If either of image is null.
+ */
+ public static boolean isImageStronglyEqual(Image lhsImg, Image rhsImg) {
+ if (lhsImg == null || rhsImg == null) {
+ throw new IllegalArgumentException("Images should be non-null");
+ }
+
+ if (lhsImg.getFormat() != rhsImg.getFormat()) {
+ Log.i(TAG, "lhsImg format " + lhsImg.getFormat() + " is different with rhsImg format "
+ + rhsImg.getFormat());
+ return false;
+ }
+
+ if (lhsImg.getWidth() != rhsImg.getWidth()) {
+ Log.i(TAG, "lhsImg width " + lhsImg.getWidth() + " is different with rhsImg width "
+ + rhsImg.getWidth());
+ return false;
+ }
+
+ if (lhsImg.getHeight() != rhsImg.getHeight()) {
+ Log.i(TAG, "lhsImg height " + lhsImg.getHeight() + " is different with rhsImg height "
+ + rhsImg.getHeight());
+ return false;
+ }
+
+ if (lhsImg.getTimestamp() != rhsImg.getTimestamp()) {
+ Log.i(TAG, "lhsImg timestamp " + lhsImg.getTimestamp()
+ + " is different with rhsImg timestamp " + rhsImg.getTimestamp());
+ return false;
+ }
+
+ if (!lhsImg.getCropRect().equals(rhsImg.getCropRect())) {
+ Log.i(TAG, "lhsImg crop rect " + lhsImg.getCropRect()
+ + " is different with rhsImg crop rect " + rhsImg.getCropRect());
+ return false;
+ }
+
+ // Compare data inside of the image.
+ Plane[] lhsPlanes = lhsImg.getPlanes();
+ Plane[] rhsPlanes = rhsImg.getPlanes();
+ ByteBuffer lhsBuffer = null;
+ ByteBuffer rhsBuffer = null;
+ for (int i = 0; i < lhsPlanes.length; i++) {
+ lhsBuffer = lhsPlanes[i].getBuffer();
+ rhsBuffer = rhsPlanes[i].getBuffer();
+ if (!lhsBuffer.equals(rhsBuffer)) {
+ Log.i(TAG, "byte buffers for plane " + i + " don't matach.");
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Set jpeg related keys in a capture request builder.
+ *
+ * @param builder The capture request builder to set the keys inl
+ * @param exifData The exif data to set.
+ * @param thumbnailSize The thumbnail size to set.
+ * @param collector The camera error collector to collect errors.
+ */
+ public static void setJpegKeys(CaptureRequest.Builder builder, ExifTestData exifData,
+ Size thumbnailSize, CameraErrorCollector collector) {
+ builder.set(CaptureRequest.JPEG_THUMBNAIL_SIZE, thumbnailSize);
+ builder.set(CaptureRequest.JPEG_GPS_LOCATION, exifData.gpsLocation);
+ builder.set(CaptureRequest.JPEG_ORIENTATION, exifData.jpegOrientation);
+ builder.set(CaptureRequest.JPEG_QUALITY, exifData.jpegQuality);
+ builder.set(CaptureRequest.JPEG_THUMBNAIL_QUALITY,
+ exifData.thumbnailQuality);
+
+ // Validate request set and get.
+ collector.expectEquals("JPEG thumbnail size request set and get should match",
+ thumbnailSize, builder.get(CaptureRequest.JPEG_THUMBNAIL_SIZE));
+ collector.expectTrue("GPS locations request set and get should match.",
+ areGpsFieldsEqual(exifData.gpsLocation,
+ builder.get(CaptureRequest.JPEG_GPS_LOCATION)));
+ collector.expectEquals("JPEG orientation request set and get should match",
+ exifData.jpegOrientation,
+ builder.get(CaptureRequest.JPEG_ORIENTATION));
+ collector.expectEquals("JPEG quality request set and get should match",
+ exifData.jpegQuality, builder.get(CaptureRequest.JPEG_QUALITY));
+ collector.expectEquals("JPEG thumbnail quality request set and get should match",
+ exifData.thumbnailQuality,
+ builder.get(CaptureRequest.JPEG_THUMBNAIL_QUALITY));
+ }
+
+ /**
+ * Simple validation of JPEG image size and format.
+ * <p>
+ * Only validate the image object sanity. It is fast, but doesn't actually
+ * check the buffer data. Assert is used here as it make no sense to
+ * continue the test if the jpeg image captured has some serious failures.
+ * </p>
+ *
+ * @param image The captured jpeg image
+ * @param expectedSize Expected capture jpeg size
+ */
+ public static void basicValidateJpegImage(Image image, Size expectedSize) {
+ Size imageSz = new Size(image.getWidth(), image.getHeight());
+ assertTrue(
+ String.format("Image size doesn't match (expected %s, actual %s) ",
+ expectedSize.toString(), imageSz.toString()), expectedSize.equals(imageSz));
+ assertEquals("Image format should be JPEG", ImageFormat.JPEG, image.getFormat());
+ assertNotNull("Image plane shouldn't be null", image.getPlanes());
+ assertEquals("Image plane number should be 1", 1, image.getPlanes().length);
+
+ // Jpeg decoding validate was done in ImageReaderTest, no need to duplicate the test here.
+ }
+
+ /**
+ * Verify the JPEG EXIF and JPEG related keys in a capture result are expected.
+ * - Capture request get values are same as were set.
+ * - capture result's exif data is the same as was set by
+ * the capture request.
+ * - new tags in the result set by the camera service are
+ * present and semantically correct.
+ *
+ * @param image The output JPEG image to verify.
+ * @param captureResult The capture result to verify.
+ * @param expectedSize The expected JPEG size.
+ * @param expectedThumbnailSize The expected thumbnail size.
+ * @param expectedExifData The expected EXIF data
+ * @param staticInfo The static metadata for the camera device.
+ * @param jpegFilename The filename to dump the jpeg to.
+ * @param collector The camera error collector to collect errors.
+ */
+ public static void verifyJpegKeys(Image image, CaptureResult captureResult, Size expectedSize,
+ Size expectedThumbnailSize, ExifTestData expectedExifData, StaticMetadata staticInfo,
+ CameraErrorCollector collector) throws Exception {
+
+ basicValidateJpegImage(image, expectedSize);
+
+ byte[] jpegBuffer = getDataFromImage(image);
+ // Have to dump into a file to be able to use ExifInterface
+ String jpegFilename = DEBUG_FILE_NAME_BASE + "/verifyJpegKeys.jpeg";
+ dumpFile(jpegFilename, jpegBuffer);
+ ExifInterface exif = new ExifInterface(jpegFilename);
+
+ if (expectedThumbnailSize.equals(new Size(0,0))) {
+ collector.expectTrue("Jpeg shouldn't have thumbnail when thumbnail size is (0, 0)",
+ !exif.hasThumbnail());
+ } else {
+ collector.expectTrue("Jpeg must have thumbnail for thumbnail size " +
+ expectedThumbnailSize, exif.hasThumbnail());
+ }
+
+ // Validate capture result vs. request
+ Size resultThumbnailSize = captureResult.get(CaptureResult.JPEG_THUMBNAIL_SIZE);
+ int orientationTested = expectedExifData.jpegOrientation;
+ // Legacy shim always doesn't rotate thumbnail size
+ if ((orientationTested == 90 || orientationTested == 270) &&
+ staticInfo.isHardwareLevelLimitedOrBetter()) {
+ int exifOrientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION,
+ /*defaultValue*/-1);
+ if (exifOrientation == ExifInterface.ORIENTATION_UNDEFINED) {
+ // Device physically rotated image+thumbnail data
+ // Expect thumbnail size to be also rotated
+ resultThumbnailSize = new Size(resultThumbnailSize.getHeight(),
+ resultThumbnailSize.getWidth());
+ }
+ }
+
+ collector.expectEquals("JPEG thumbnail size result and request should match",
+ expectedThumbnailSize, resultThumbnailSize);
+ if (collector.expectKeyValueNotNull(captureResult, CaptureResult.JPEG_GPS_LOCATION) !=
+ null) {
+ collector.expectTrue("GPS location result and request should match.",
+ areGpsFieldsEqual(expectedExifData.gpsLocation,
+ captureResult.get(CaptureResult.JPEG_GPS_LOCATION)));
+ }
+ collector.expectEquals("JPEG orientation result and request should match",
+ expectedExifData.jpegOrientation,
+ captureResult.get(CaptureResult.JPEG_ORIENTATION));
+ collector.expectEquals("JPEG quality result and request should match",
+ expectedExifData.jpegQuality, captureResult.get(CaptureResult.JPEG_QUALITY));
+ collector.expectEquals("JPEG thumbnail quality result and request should match",
+ expectedExifData.thumbnailQuality,
+ captureResult.get(CaptureResult.JPEG_THUMBNAIL_QUALITY));
+
+ // Validate other exif tags for all non-legacy devices
+ if (!staticInfo.isHardwareLevelLegacy()) {
+ verifyJpegExifExtraTags(exif, expectedSize, captureResult, staticInfo, collector);
+ }
+ }
+
+ /**
+ * Get the degree of an EXIF orientation.
+ */
+ private static int getExifOrientationInDegree(int exifOrientation,
+ CameraErrorCollector collector) {
+ switch (exifOrientation) {
+ case ExifInterface.ORIENTATION_NORMAL:
+ return 0;
+ case ExifInterface.ORIENTATION_ROTATE_90:
+ return 90;
+ case ExifInterface.ORIENTATION_ROTATE_180:
+ return 180;
+ case ExifInterface.ORIENTATION_ROTATE_270:
+ return 270;
+ default:
+ collector.addMessage("It is impossible to get non 0, 90, 180, 270 degress exif" +
+ "info based on the request orientation range");
+ return 0;
+ }
+ }
+
+ /**
+ * Validate and return the focal length.
+ *
+ * @param result Capture result to get the focal length
+ * @return Focal length from capture result or -1 if focal length is not available.
+ */
+ private static float validateFocalLength(CaptureResult result, StaticMetadata staticInfo,
+ CameraErrorCollector collector) {
+ float[] focalLengths = staticInfo.getAvailableFocalLengthsChecked();
+ Float resultFocalLength = result.get(CaptureResult.LENS_FOCAL_LENGTH);
+ if (collector.expectTrue("Focal length is invalid",
+ resultFocalLength != null && resultFocalLength > 0)) {
+ List<Float> focalLengthList =
+ Arrays.asList(CameraTestUtils.toObject(focalLengths));
+ collector.expectTrue("Focal length should be one of the available focal length",
+ focalLengthList.contains(resultFocalLength));
+ return resultFocalLength;
+ }
+ return -1;
+ }
+
+ /**
+ * Validate and return the aperture.
+ *
+ * @param result Capture result to get the aperture
+ * @return Aperture from capture result or -1 if aperture is not available.
+ */
+ private static float validateAperture(CaptureResult result, StaticMetadata staticInfo,
+ CameraErrorCollector collector) {
+ float[] apertures = staticInfo.getAvailableAperturesChecked();
+ Float resultAperture = result.get(CaptureResult.LENS_APERTURE);
+ if (collector.expectTrue("Capture result aperture is invalid",
+ resultAperture != null && resultAperture > 0)) {
+ List<Float> apertureList =
+ Arrays.asList(CameraTestUtils.toObject(apertures));
+ collector.expectTrue("Aperture should be one of the available apertures",
+ apertureList.contains(resultAperture));
+ return resultAperture;
+ }
+ return -1;
+ }
+
+ /**
+ * Return the closest value in an array of floats.
+ */
+ private static float getClosestValueInArray(float[] values, float target) {
+ int minIdx = 0;
+ float minDistance = Math.abs(values[0] - target);
+ for(int i = 0; i < values.length; i++) {
+ float distance = Math.abs(values[i] - target);
+ if (minDistance > distance) {
+ minDistance = distance;
+ minIdx = i;
+ }
+ }
+
+ return values[minIdx];
+ }
+
+ /**
+ * Return if two Location's GPS field are the same.
+ */
+ private static boolean areGpsFieldsEqual(Location a, Location b) {
+ if (a == null || b == null) {
+ return false;
+ }
+
+ return a.getTime() == b.getTime() && a.getLatitude() == b.getLatitude() &&
+ a.getLongitude() == b.getLongitude() && a.getAltitude() == b.getAltitude() &&
+ a.getProvider() == b.getProvider();
+ }
+
+ /**
+ * Verify extra tags in JPEG EXIF
+ */
+ private static void verifyJpegExifExtraTags(ExifInterface exif, Size jpegSize,
+ CaptureResult result, StaticMetadata staticInfo, CameraErrorCollector collector)
+ throws ParseException {
+ /**
+ * TAG_IMAGE_WIDTH and TAG_IMAGE_LENGTH and TAG_ORIENTATION.
+ * Orientation and exif width/height need to be tested carefully, two cases:
+ *
+ * 1. Device rotate the image buffer physically, then exif width/height may not match
+ * the requested still capture size, we need swap them to check.
+ *
+ * 2. Device use the exif tag to record the image orientation, it doesn't rotate
+ * the jpeg image buffer itself. In this case, the exif width/height should always match
+ * the requested still capture size, and the exif orientation should always match the
+ * requested orientation.
+ *
+ */
+ int exifWidth = exif.getAttributeInt(ExifInterface.TAG_IMAGE_WIDTH, /*defaultValue*/0);
+ int exifHeight = exif.getAttributeInt(ExifInterface.TAG_IMAGE_LENGTH, /*defaultValue*/0);
+ Size exifSize = new Size(exifWidth, exifHeight);
+ // Orientation could be missing, which is ok, default to 0.
+ int exifOrientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION,
+ /*defaultValue*/-1);
+ // Get requested orientation from result, because they should be same.
+ if (collector.expectKeyValueNotNull(result, CaptureResult.JPEG_ORIENTATION) != null) {
+ int requestedOrientation = result.get(CaptureResult.JPEG_ORIENTATION);
+ final int ORIENTATION_MIN = ExifInterface.ORIENTATION_UNDEFINED;
+ final int ORIENTATION_MAX = ExifInterface.ORIENTATION_ROTATE_270;
+ boolean orientationValid = collector.expectTrue(String.format(
+ "Exif orientation must be in range of [%d, %d]",
+ ORIENTATION_MIN, ORIENTATION_MAX),
+ exifOrientation >= ORIENTATION_MIN && exifOrientation <= ORIENTATION_MAX);
+ if (orientationValid) {
+ /**
+ * Device captured image doesn't respect the requested orientation,
+ * which means it rotates the image buffer physically. Then we
+ * should swap the exif width/height accordingly to compare.
+ */
+ boolean deviceRotatedImage = exifOrientation == ExifInterface.ORIENTATION_UNDEFINED;
+
+ if (deviceRotatedImage) {
+ // Case 1.
+ boolean needSwap = (requestedOrientation % 180 == 90);
+ if (needSwap) {
+ exifSize = new Size(exifHeight, exifWidth);
+ }
+ } else {
+ // Case 2.
+ collector.expectEquals("Exif orientaiton should match requested orientation",
+ requestedOrientation, getExifOrientationInDegree(exifOrientation,
+ collector));
+ }
+ }
+ }
+
+ /**
+ * Ideally, need check exifSize == jpegSize == actual buffer size. But
+ * jpegSize == jpeg decode bounds size(from jpeg jpeg frame
+ * header, not exif) was validated in ImageReaderTest, no need to
+ * validate again here.
+ */
+ collector.expectEquals("Exif size should match jpeg capture size", jpegSize, exifSize);
+
+ // TAG_DATETIME, it should be local time
+ long currentTimeInMs = System.currentTimeMillis();
+ long currentTimeInSecond = currentTimeInMs / 1000;
+ Date date = new Date(currentTimeInMs);
+ String localDatetime = new SimpleDateFormat("yyyy:MM:dd HH:").format(date);
+ String dateTime = exif.getAttribute(ExifInterface.TAG_DATETIME);
+ if (collector.expectTrue("Exif TAG_DATETIME shouldn't be null", dateTime != null)) {
+ collector.expectTrue("Exif TAG_DATETIME is wrong",
+ dateTime.length() == EXIF_DATETIME_LENGTH);
+ long exifTimeInSecond =
+ new SimpleDateFormat("yyyy:MM:dd HH:mm:ss").parse(dateTime).getTime() / 1000;
+ long delta = currentTimeInSecond - exifTimeInSecond;
+ collector.expectTrue("Capture time deviates too much from the current time",
+ Math.abs(delta) < EXIF_DATETIME_ERROR_MARGIN_SEC);
+ // It should be local time.
+ collector.expectTrue("Exif date time should be local time",
+ dateTime.startsWith(localDatetime));
+ }
+
+ // TAG_FOCAL_LENGTH.
+ float[] focalLengths = staticInfo.getAvailableFocalLengthsChecked();
+ float exifFocalLength = (float)exif.getAttributeDouble(ExifInterface.TAG_FOCAL_LENGTH, -1);
+ collector.expectEquals("Focal length should match",
+ getClosestValueInArray(focalLengths, exifFocalLength),
+ exifFocalLength, EXIF_FOCAL_LENGTH_ERROR_MARGIN);
+ // More checks for focal length.
+ collector.expectEquals("Exif focal length should match capture result",
+ validateFocalLength(result, staticInfo, collector), exifFocalLength);
+
+ // TAG_EXPOSURE_TIME
+ // ExifInterface API gives exposure time value in the form of float instead of rational
+ String exposureTime = exif.getAttribute(ExifInterface.TAG_EXPOSURE_TIME);
+ collector.expectNotNull("Exif TAG_EXPOSURE_TIME shouldn't be null", exposureTime);
+ if (staticInfo.areKeysAvailable(CaptureResult.SENSOR_EXPOSURE_TIME)) {
+ if (exposureTime != null) {
+ double exposureTimeValue = Double.parseDouble(exposureTime);
+ long expTimeResult = result.get(CaptureResult.SENSOR_EXPOSURE_TIME);
+ double expected = expTimeResult / 1e9;
+ double tolerance = expected * EXIF_EXPOSURE_TIME_ERROR_MARGIN_RATIO;
+ tolerance = Math.max(tolerance, EXIF_EXPOSURE_TIME_MIN_ERROR_MARGIN_SEC);
+ collector.expectEquals("Exif exposure time doesn't match", expected,
+ exposureTimeValue, tolerance);
+ }
+ }
+
+ // TAG_APERTURE
+ // ExifInterface API gives aperture value in the form of float instead of rational
+ String exifAperture = exif.getAttribute(ExifInterface.TAG_APERTURE);
+ collector.expectNotNull("Exif TAG_APERTURE shouldn't be null", exifAperture);
+ if (staticInfo.areKeysAvailable(CameraCharacteristics.LENS_INFO_AVAILABLE_APERTURES)) {
+ float[] apertures = staticInfo.getAvailableAperturesChecked();
+ if (exifAperture != null) {
+ float apertureValue = Float.parseFloat(exifAperture);
+ collector.expectEquals("Aperture value should match",
+ getClosestValueInArray(apertures, apertureValue),
+ apertureValue, EXIF_APERTURE_ERROR_MARGIN);
+ // More checks for aperture.
+ collector.expectEquals("Exif aperture length should match capture result",
+ validateAperture(result, staticInfo, collector), apertureValue);
+ }
+ }
+
+ /**
+ * TAG_FLASH. TODO: For full devices, can check a lot more info
+ * (http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/EXIF.html#Flash)
+ */
+ String flash = exif.getAttribute(ExifInterface.TAG_FLASH);
+ collector.expectNotNull("Exif TAG_FLASH shouldn't be null", flash);
+
+ /**
+ * TAG_WHITE_BALANCE. TODO: For full devices, with the DNG tags, we
+ * should be able to cross-check android.sensor.referenceIlluminant.
+ */
+ String whiteBalance = exif.getAttribute(ExifInterface.TAG_WHITE_BALANCE);
+ collector.expectNotNull("Exif TAG_WHITE_BALANCE shouldn't be null", whiteBalance);
+
+ // TAG_MAKE
+ String make = exif.getAttribute(ExifInterface.TAG_MAKE);
+ collector.expectEquals("Exif TAG_MAKE is incorrect", Build.MANUFACTURER, make);
+
+ // TAG_MODEL
+ String model = exif.getAttribute(ExifInterface.TAG_MODEL);
+ collector.expectEquals("Exif TAG_MODEL is incorrect", Build.MODEL, model);
+
+
+ // TAG_ISO
+ int iso = exif.getAttributeInt(ExifInterface.TAG_ISO, /*defaultValue*/-1);
+ if (staticInfo.areKeysAvailable(CaptureResult.SENSOR_SENSITIVITY)) {
+ int expectedIso = result.get(CaptureResult.SENSOR_SENSITIVITY);
+ collector.expectEquals("Exif TAG_ISO is incorrect", expectedIso, iso);
+ }
+
+ // TAG_DATETIME_DIGITIZED (a.k.a Create time for digital cameras).
+ String digitizedTime = exif.getAttribute(ExifInterface.TAG_DATETIME_DIGITIZED);
+ collector.expectNotNull("Exif TAG_DATETIME_DIGITIZED shouldn't be null", digitizedTime);
+ if (digitizedTime != null) {
+ String expectedDateTime = exif.getAttribute(ExifInterface.TAG_DATETIME);
+ collector.expectNotNull("Exif TAG_DATETIME shouldn't be null", expectedDateTime);
+ if (expectedDateTime != null) {
+ collector.expectEquals("dataTime should match digitizedTime",
+ expectedDateTime, digitizedTime);
+ }
+ }
+
+ /**
+ * TAG_SUBSEC_TIME. Since the sub second tag strings are truncated to at
+ * most 9 digits in ExifInterface implementation, use getAttributeInt to
+ * sanitize it. When the default value -1 is returned, it means that
+ * this exif tag either doesn't exist or is a non-numerical invalid
+ * string. Same rule applies to the rest of sub second tags.
+ */
+ int subSecTime = exif.getAttributeInt(ExifInterface.TAG_SUBSEC_TIME, /*defaultValue*/-1);
+ collector.expectTrue("Exif TAG_SUBSEC_TIME value is null or invalid!", subSecTime > 0);
+
+ // TAG_SUBSEC_TIME_ORIG
+ int subSecTimeOrig = exif.getAttributeInt(ExifInterface.TAG_SUBSEC_TIME_ORIG,
+ /*defaultValue*/-1);
+ collector.expectTrue("Exif TAG_SUBSEC_TIME_ORIG value is null or invalid!",
+ subSecTimeOrig > 0);
+
+ // TAG_SUBSEC_TIME_DIG
+ int subSecTimeDig = exif.getAttributeInt(ExifInterface.TAG_SUBSEC_TIME_DIG,
+ /*defaultValue*/-1);
+ collector.expectTrue(
+ "Exif TAG_SUBSEC_TIME_DIG value is null or invalid!", subSecTimeDig > 0);
+ }
+
+
+ /**
+ * Immutable class wrapping the exif test data.
+ */
+ public static class ExifTestData {
+ public final Location gpsLocation;
+ public final int jpegOrientation;
+ public final byte jpegQuality;
+ public final byte thumbnailQuality;
+
+ public ExifTestData(Location location, int orientation,
+ byte jpgQuality, byte thumbQuality) {
+ gpsLocation = location;
+ jpegOrientation = orientation;
+ jpegQuality = jpgQuality;
+ thumbnailQuality = thumbQuality;
+ }
+ }
+
+ public static Size getPreviewSizeBound(WindowManager windowManager, Size bound) {
+ Display display = windowManager.getDefaultDisplay();
+
+ int width = display.getWidth();
+ int height = display.getHeight();
+
+ if (height > width) {
+ height = width;
+ width = display.getHeight();
+ }
+
+ if (bound.getWidth() <= width &&
+ bound.getHeight() <= height)
+ return bound;
+ else
+ return new Size(width, height);
+ }
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraUtils.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraUtils.java
new file mode 100644
index 0000000..dff20a6
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraUtils.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mediaframeworktest.helpers;
+
+import android.content.Context;
+import android.hardware.Camera;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraManager;
+
+import java.util.Comparator;
+
+/**
+ * Utility class containing helper functions for the Camera framework tests.
+ */
+/**
+ * (non-Javadoc)
+ * @see android.hardware.cts.helpers.CameraUtils
+ */
+public class CameraUtils {
+
+ /**
+ * Returns {@code true} if this device only supports {@code LEGACY} mode operation in the
+ * Camera2 API for the given camera ID.
+ *
+ * @param context {@link Context} to access the {@link CameraManager} in.
+ * @param cameraId the ID of the camera device to check.
+ * @return {@code true} if this device only supports {@code LEGACY} mode.
+ */
+ public static boolean isLegacyHAL(Context context, int cameraId) throws Exception {
+ CameraManager manager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
+ CameraCharacteristics characteristics =
+ manager.getCameraCharacteristics(Integer.toString(cameraId));
+
+ return characteristics.get(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL) ==
+ CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY;
+ }
+
+ /**
+ * Shared size comparison method used by size comparators.
+ *
+ * <p>Compares the number of pixels it covers.If two the areas of two sizes are same, compare
+ * the widths.</p>
+ */
+ public static int compareSizes(int widthA, int heightA, int widthB, int heightB) {
+ long left = widthA * (long) heightA;
+ long right = widthB * (long) heightB;
+ if (left == right) {
+ left = widthA;
+ right = widthB;
+ }
+ return (left < right) ? -1 : (left > right ? 1 : 0);
+ }
+
+ /**
+ * Size comparator that compares the number of pixels it covers.
+ *
+ * <p>If two the areas of two sizes are same, compare the widths.</p>
+ */
+ public static class LegacySizeComparator implements Comparator<Camera.Size> {
+ @Override
+ public int compare(Camera.Size lhs, Camera.Size rhs) {
+ return compareSizes(lhs.width, lhs.height, rhs.width, rhs.height);
+ }
+ }
+
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/InMatcher.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/InMatcher.java
new file mode 100644
index 0000000..e25a140
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/InMatcher.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.mediaframeworktest.helpers;
+
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Factory;
+import org.hamcrest.Matcher;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Objects;
+
+/**
+ * A {@link Matcher} class for checking if value contained in a {@link Collection} or array.
+ */
+/**
+ * (non-Javadoc)
+ * @see android.hardware.camera2.cts.helpers.InMatcher
+ */
+public class InMatcher<T> extends BaseMatcher<T> {
+
+ protected Collection<T> mValues;
+
+ public InMatcher(Collection<T> values) {
+ Preconditions.checkNotNull("values", values);
+ mValues = values;
+ }
+
+ public InMatcher(T... values) {
+ Preconditions.checkNotNull(values);
+ mValues = Arrays.asList(values);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public boolean matches(Object o) {
+ T obj = (T) o;
+ for (T elem : mValues) {
+ if (Objects.equals(o, elem)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("in(").appendValue(mValues).appendText(")");
+ }
+
+ @Factory
+ public static <T> Matcher<T> in(T... operand) {
+ return new InMatcher<T>(operand);
+ }
+
+ @Factory
+ public static <T> Matcher<T> in(Collection<T> operand) {
+ return new InMatcher<T>(operand);
+ }
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/Preconditions.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/Preconditions.java
new file mode 100644
index 0000000..96b0424
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/Preconditions.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mediaframeworktest.helpers;
+
+import java.util.Collection;
+import java.util.Objects;
+
+/**
+ * Helper set of methods to perform precondition checks before starting method execution.
+ *
+ * <p>Typically used to sanity check arguments or the current object state.</p>
+ */
+/**
+ * (non-Javadoc)
+ * @see android.hardware.camera2.cts.helpers.Preconditions
+ */
+public final class Preconditions {
+
+ /**
+ * Checks that the value has the expected bitwise flags set.
+ *
+ * @param argName Name of the argument
+ * @param arg Argument to check
+ * @param flagsName Name of the bitwise flags
+ * @param flags Bit flags to check.
+ * @return arg
+ *
+ * @throws IllegalArgumentException if the bitwise flags weren't set
+ */
+ public static int checkBitFlags(String argName, int arg, String flagsName, int flags) {
+ if ((arg & flags) == 0) {
+ throw new IllegalArgumentException(
+ String.format("Argument '%s' must have flags '%s' set", argName, flagsName));
+ }
+
+ return arg;
+ }
+
+ /**
+ * Checks that the value is {@link Object#equals equal} to the expected value.
+ *
+ * @param argName Name of the argument
+ * @param arg Argument to check
+ * @param expectedName Name of the expected value
+ * @param expectedValue Expected value
+ * @return arg
+ *
+ * @throws IllegalArgumentException if the values were not equal
+ */
+ public static <T> T checkEquals(String argName, T arg,
+ String expectedName, T expectedValue) {
+ if (!Objects.equals(arg, expectedValue)) {
+ throw new IllegalArgumentException(
+ String.format(
+ "Argument '%s' must be equal to '%s' (was '%s', but expected '%s')",
+ argName, expectedName, arg, expectedValue));
+ }
+
+ return arg;
+ }
+
+ /**
+ * Checks that the value is not {@code null}.
+ *
+ * <p>
+ * Returns the value directly, so you can use {@code checkNotNull("value", value)} inline.
+ * </p>
+ *
+ * @param argName Name of the argument
+ * @param arg Argument to check
+ * @return arg
+ *
+ * @throws NullPointerException if arg was {@code null}
+ */
+ public static <T> T checkNotNull(String argName, T arg) {
+ if (arg == null) {
+ throw new NullPointerException("Argument '" + argName + "' must not be null");
+ }
+
+ return arg;
+ }
+
+ /**
+ * Checks that the value is not {@code null}.
+ *
+ * <p>
+ * Returns the value directly, so you can use {@code checkNotNull("value", value)} inline.
+ * </p>
+ *
+ * @param arg Argument to check
+ * @return arg
+ *
+ * @throws NullPointerException if arg was {@code null}
+ */
+ public static <T> T checkNotNull(T arg) {
+ return checkNotNull("", arg);
+ }
+
+ /**
+ * Checks that the state is currently {@link true}.
+ *
+ * @param message Message to raise an exception with if the state checking fails.
+ * @param state State to check
+ *
+ * @throws IllegalStateException if state was {@code false}
+ *
+ * @return The state value (always {@code true}).
+ */
+ public static boolean checkState(String message, boolean state) {
+ if (!state) {
+ throw new IllegalStateException(message);
+ }
+
+ return state;
+ }
+
+ /**
+ * Ensures that the {@link Collection} is not {@code null}, and none of its elements are
+ * {@code null}.
+ *
+ * @param value a {@link Collection} of boxed objects
+ * @param valueName the name of the argument to use if the check fails
+ *
+ * @return the validated {@link Collection}
+ *
+ * @throws NullPointerException if the {@code value} or any of its elements were {@code null}
+ */
+ public static <T> Collection<T> checkCollectionElementsNotNull(final Collection<T> value,
+ final String valueName) {
+ if (value == null) {
+ throw new NullPointerException(valueName + " must not be null");
+ }
+
+ long ctr = 0;
+ for (T elem : value) {
+ if (elem == null) {
+ throw new NullPointerException(
+ String.format("%s[%d] must not be null", valueName, ctr));
+ }
+ ++ctr;
+ }
+
+ return value;
+ }
+
+ /**
+ * Ensures that the {@link Collection} is not {@code null}, and contains at least one element.
+ *
+ * @param value a {@link Collection} of boxed elements.
+ * @param valueName the name of the argument to use if the check fails.
+
+ * @return the validated {@link Collection}
+ *
+ * @throws NullPointerException if the {@code value} was {@code null}
+ * @throws IllegalArgumentException if the {@code value} was empty
+ */
+ public static <T> Collection<T> checkCollectionNotEmpty(final Collection<T> value,
+ final String valueName) {
+ if (value == null) {
+ throw new NullPointerException(valueName + " must not be null");
+ }
+ if (value.isEmpty()) {
+ throw new IllegalArgumentException(valueName + " is empty");
+ }
+ return value;
+ }
+
+ // Suppress default constructor for noninstantiability
+ private Preconditions() { throw new AssertionError(); }
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/StaticMetadata.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/StaticMetadata.java
new file mode 100644
index 0000000..6678f8b
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/StaticMetadata.java
@@ -0,0 +1,2393 @@
+/*
+ * Copyright 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mediaframeworktest.helpers;
+
+import junit.framework.Assert;
+
+import android.graphics.ImageFormat;
+import android.graphics.Rect;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraCharacteristics.Key;
+import android.hardware.camera2.CameraMetadata;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.hardware.camera2.params.StreamConfigurationMap;
+import android.util.Log;
+import android.util.Range;
+import android.util.Rational;
+import android.util.Size;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static com.android.mediaframeworktest.helpers.AssertHelpers.assertArrayContainsAnyOf;
+
+/**
+ * Helpers to get common static info out of the camera.
+ *
+ * <p>Avoid boiler plate by putting repetitive get/set patterns in this class.</p>
+ *
+ * <p>Attempt to be durable against the camera device having bad or missing metadata
+ * by providing reasonable defaults and logging warnings when that happens.</p>
+ */
+/**
+ * (non-Javadoc)
+ * @see android.hardware.camera2.cts.helpers.StaticMetadata
+ */
+public class StaticMetadata {
+
+ private static final String TAG = "StaticMetadata";
+ private static final int IGNORE_SIZE_CHECK = -1;
+
+ private static final long SENSOR_INFO_EXPOSURE_TIME_RANGE_MIN_AT_MOST = 100000L; // 100us
+ private static final long SENSOR_INFO_EXPOSURE_TIME_RANGE_MAX_AT_LEAST = 100000000; // 100ms
+ private static final int SENSOR_INFO_SENSITIVITY_RANGE_MIN_AT_MOST = 100;
+ private static final int SENSOR_INFO_SENSITIVITY_RANGE_MAX_AT_LEAST = 800;
+ private static final int STATISTICS_INFO_MAX_FACE_COUNT_MIN_AT_LEAST = 4;
+ private static final int TONEMAP_MAX_CURVE_POINTS_AT_LEAST = 64;
+ private static final int CONTROL_AE_COMPENSATION_RANGE_DEFAULT_MIN = -2;
+ private static final int CONTROL_AE_COMPENSATION_RANGE_DEFAULT_MAX = 2;
+ private static final Rational CONTROL_AE_COMPENSATION_STEP_DEFAULT = new Rational(1, 2);
+ private static final byte REQUEST_PIPELINE_MAX_DEPTH_MAX = 8;
+ private static final int MAX_REPROCESS_MAX_CAPTURE_STALL = 4;
+
+ // TODO: Consider making this work across any metadata object, not just camera characteristics
+ private final CameraCharacteristics mCharacteristics;
+ private final CheckLevel mLevel;
+ private final CameraErrorCollector mCollector;
+
+ // Index with android.control.aeMode
+ public static final String[] AE_MODE_NAMES = new String[] {
+ "AE_MODE_OFF",
+ "AE_MODE_ON",
+ "AE_MODE_ON_AUTO_FLASH",
+ "AE_MODE_ON_ALWAYS_FLASH",
+ "AE_MODE_ON_AUTO_FLASH_REDEYE"
+ };
+
+ // Index with android.control.afMode
+ public static final String[] AF_MODE_NAMES = new String[] {
+ "AF_MODE_OFF",
+ "AF_MODE_AUTO",
+ "AF_MODE_MACRO",
+ "AF_MODE_CONTINUOUS_VIDEO",
+ "AF_MODE_CONTINUOUS_PICTURE",
+ "AF_MODE_EDOF"
+ };
+
+ // Index with android.control.aeState
+ public static final String[] AE_STATE_NAMES = new String[] {
+ "AE_STATE_INACTIVE",
+ "AE_STATE_SEARCHING",
+ "AE_STATE_CONVERGED",
+ "AE_STATE_LOCKED",
+ "AE_STATE_FLASH_REQUIRED",
+ "AE_STATE_PRECAPTURE"
+ };
+
+ // Index with android.control.afState
+ public static final String[] AF_STATE_NAMES = new String[] {
+ "AF_STATE_INACTIVE",
+ "AF_STATE_PASSIVE_SCAN",
+ "AF_STATE_PASSIVE_FOCUSED",
+ "AF_STATE_ACTIVE_SCAN",
+ "AF_STATE_FOCUSED_LOCKED",
+ "AF_STATE_NOT_FOCUSED_LOCKED",
+ "AF_STATE_PASSIVE_UNFOCUSED"
+ };
+
+ public enum CheckLevel {
+ /** Only log warnings for metadata check failures. Execution continues. */
+ WARN,
+ /**
+ * Use ErrorCollector to collect the metadata check failures, Execution
+ * continues.
+ */
+ COLLECT,
+ /** Assert the metadata check failures. Execution aborts. */
+ ASSERT
+ }
+
+ /**
+ * Construct a new StaticMetadata object.
+ *
+ *<p> Default constructor, only log warnings for the static metadata check failures</p>
+ *
+ * @param characteristics static info for a camera
+ * @throws IllegalArgumentException if characteristics was null
+ */
+ public StaticMetadata(CameraCharacteristics characteristics) {
+ this(characteristics, CheckLevel.WARN, /*collector*/null);
+ }
+
+ /**
+ * Construct a new StaticMetadata object with {@link CameraErrorCollector}.
+ * <p>
+ * When level is not {@link CheckLevel.COLLECT}, the {@link CameraErrorCollector} will be
+ * ignored, otherwise, it will be used to log the check failures.
+ * </p>
+ *
+ * @param characteristics static info for a camera
+ * @param collector The {@link CameraErrorCollector} used by this StaticMetadata
+ * @throws IllegalArgumentException if characteristics or collector was null.
+ */
+ public StaticMetadata(CameraCharacteristics characteristics, CameraErrorCollector collector) {
+ this(characteristics, CheckLevel.COLLECT, collector);
+ }
+
+ /**
+ * Construct a new StaticMetadata object with {@link CheckLevel} and
+ * {@link CameraErrorCollector}.
+ * <p>
+ * When level is not {@link CheckLevel.COLLECT}, the {@link CameraErrorCollector} will be
+ * ignored, otherwise, it will be used to log the check failures.
+ * </p>
+ *
+ * @param characteristics static info for a camera
+ * @param level The {@link CheckLevel} of this StaticMetadata
+ * @param collector The {@link CameraErrorCollector} used by this StaticMetadata
+ * @throws IllegalArgumentException if characteristics was null or level was
+ * {@link CheckLevel.COLLECT} but collector was null.
+ */
+ public StaticMetadata(CameraCharacteristics characteristics, CheckLevel level,
+ CameraErrorCollector collector) {
+ if (characteristics == null) {
+ throw new IllegalArgumentException("characteristics was null");
+ }
+ if (level == CheckLevel.COLLECT && collector == null) {
+ throw new IllegalArgumentException("collector must valid when COLLECT level is set");
+ }
+
+ mCharacteristics = characteristics;
+ mLevel = level;
+ mCollector = collector;
+ }
+
+ /**
+ * Get the CameraCharacteristics associated with this StaticMetadata.
+ *
+ * @return A non-null CameraCharacteristics object
+ */
+ public CameraCharacteristics getCharacteristics() {
+ return mCharacteristics;
+ }
+
+ /**
+ * Whether or not the hardware level reported by android.info.supportedHardwareLevel
+ * is {@value CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_FULL}.
+ *
+ * <p>If the camera device is not reporting the hardwareLevel, this
+ * will cause the test to fail.</p>
+ *
+ * @return {@code true} if the device is {@code FULL}, {@code false} otherwise.
+ */
+ public boolean isHardwareLevelFull() {
+ return getHardwareLevelChecked() == CameraMetadata.INFO_SUPPORTED_HARDWARE_LEVEL_FULL;
+ }
+
+ /**
+ * Whether or not the hardware level reported by android.info.supportedHardwareLevel
+ * Return the supported hardware level of the device, or fail if no value is reported.
+ *
+ * @return the supported hardware level as a constant defined for
+ * {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL}.
+ */
+ public int getHardwareLevelChecked() {
+ Integer hwLevel = getValueFromKeyNonNull(
+ CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL);
+ if (hwLevel == null) {
+ Assert.fail("No supported hardware level reported.");
+ }
+ return hwLevel;
+ }
+
+ /**
+ * Whether or not the hardware level reported by android.info.supportedHardwareLevel
+ * is {@value CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY}.
+ *
+ * <p>If the camera device is not reporting the hardwareLevel, this
+ * will cause the test to fail.</p>
+ *
+ * @return {@code true} if the device is {@code LEGACY}, {@code false} otherwise.
+ */
+ public boolean isHardwareLevelLegacy() {
+ return getHardwareLevelChecked() == CameraMetadata.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY;
+ }
+
+ /**
+ * Whether or not the per frame control is supported by the camera device.
+ *
+ * @return {@code true} if per frame control is supported, {@code false} otherwise.
+ */
+ public boolean isPerFrameControlSupported() {
+ return getSyncMaxLatency() == CameraMetadata.SYNC_MAX_LATENCY_PER_FRAME_CONTROL;
+ }
+
+ /**
+ * Get the maximum number of frames to wait for a request settings being applied
+ *
+ * @return CameraMetadata.SYNC_MAX_LATENCY_UNKNOWN for unknown latency
+ * CameraMetadata.SYNC_MAX_LATENCY_PER_FRAME_CONTROL for per frame control
+ * a positive int otherwise
+ */
+ public int getSyncMaxLatency() {
+ Integer value = getValueFromKeyNonNull(CameraCharacteristics.SYNC_MAX_LATENCY);
+ if (value == null) {
+ return CameraMetadata.SYNC_MAX_LATENCY_UNKNOWN;
+ }
+ return value;
+ }
+
+ /**
+ * Whether or not the hardware level reported by android.info.supportedHardwareLevel
+ * is {@value CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED}.
+ *
+ * <p>If the camera device is incorrectly reporting the hardwareLevel, this
+ * will always return {@code true}.</p>
+ *
+ * @return {@code true} if the device is {@code LIMITED}, {@code false} otherwise.
+ */
+ public boolean isHardwareLevelLimited() {
+ return getHardwareLevelChecked() == CameraMetadata.INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;
+ }
+
+ /**
+ * Whether or not the hardware level reported by {@code android.info.supportedHardwareLevel}
+ * is at least {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED}.
+ *
+ * <p>If the camera device is incorrectly reporting the hardwareLevel, this
+ * will always return {@code false}.</p>
+ *
+ * @return
+ * {@code true} if the device is {@code LIMITED} or {@code FULL},
+ * {@code false} otherwise (i.e. LEGACY).
+ */
+ public boolean isHardwareLevelLimitedOrBetter() {
+ Integer hwLevel = getValueFromKeyNonNull(
+ CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL);
+
+ if (hwLevel == null) {
+ return false;
+ }
+
+ // Normal. Device could be limited.
+ int hwLevelInt = hwLevel;
+ return hwLevelInt == CameraMetadata.INFO_SUPPORTED_HARDWARE_LEVEL_FULL ||
+ hwLevelInt == CameraMetadata.INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;
+ }
+
+ /**
+ * Get the maximum number of partial result a request can expect
+ *
+ * @return 1 if partial result is not supported.
+ * a integer value larger than 1 if partial result is supported.
+ */
+ public int getPartialResultCount() {
+ Integer value = mCharacteristics.get(CameraCharacteristics.REQUEST_PARTIAL_RESULT_COUNT);
+ if (value == null) {
+ // Optional key. Default value is 1 if key is missing.
+ return 1;
+ }
+ return value;
+ }
+
+ /**
+ * Get the exposure time value and clamp to the range if needed.
+ *
+ * @param exposure Input exposure time value to check.
+ * @return Exposure value in the legal range.
+ */
+ public long getExposureClampToRange(long exposure) {
+ long minExposure = getExposureMinimumOrDefault(Long.MAX_VALUE);
+ long maxExposure = getExposureMaximumOrDefault(Long.MIN_VALUE);
+ if (minExposure > SENSOR_INFO_EXPOSURE_TIME_RANGE_MIN_AT_MOST) {
+ failKeyCheck(CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE,
+ String.format(
+ "Min value %d is too large, set to maximal legal value %d",
+ minExposure, SENSOR_INFO_EXPOSURE_TIME_RANGE_MIN_AT_MOST));
+ minExposure = SENSOR_INFO_EXPOSURE_TIME_RANGE_MIN_AT_MOST;
+ }
+ if (maxExposure < SENSOR_INFO_EXPOSURE_TIME_RANGE_MAX_AT_LEAST) {
+ failKeyCheck(CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE,
+ String.format(
+ "Max value %d is too small, set to minimal legal value %d",
+ maxExposure, SENSOR_INFO_EXPOSURE_TIME_RANGE_MAX_AT_LEAST));
+ maxExposure = SENSOR_INFO_EXPOSURE_TIME_RANGE_MAX_AT_LEAST;
+ }
+
+ return Math.max(minExposure, Math.min(maxExposure, exposure));
+ }
+
+ /**
+ * Check if the camera device support focuser.
+ *
+ * @return true if camera device support focuser, false otherwise.
+ */
+ public boolean hasFocuser() {
+ if (areKeysAvailable(CameraCharacteristics.LENS_INFO_MINIMUM_FOCUS_DISTANCE)) {
+ // LEGACY devices don't have lens.info.minimumFocusDistance, so guard this query
+ return (getMinimumFocusDistanceChecked() > 0);
+ } else {
+ // Check available AF modes
+ int[] availableAfModes = mCharacteristics.get(
+ CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES);
+
+ if (availableAfModes == null) {
+ return false;
+ }
+
+ // Assume that if we have an AF mode which doesn't ignore AF trigger, we have a focuser
+ boolean hasFocuser = false;
+ loop: for (int mode : availableAfModes) {
+ switch (mode) {
+ case CameraMetadata.CONTROL_AF_MODE_AUTO:
+ case CameraMetadata.CONTROL_AF_MODE_CONTINUOUS_PICTURE:
+ case CameraMetadata.CONTROL_AF_MODE_CONTINUOUS_VIDEO:
+ case CameraMetadata.CONTROL_AF_MODE_MACRO:
+ hasFocuser = true;
+ break loop;
+ }
+ }
+
+ return hasFocuser;
+ }
+ }
+
+ /**
+ * Check if the camera device has flash unit.
+ * @return true if flash unit is available, false otherwise.
+ */
+ public boolean hasFlash() {
+ return getFlashInfoChecked();
+ }
+
+ /**
+ * Get minimum focus distance.
+ *
+ * @return minimum focus distance, 0 if minimum focus distance is invalid.
+ */
+ public float getMinimumFocusDistanceChecked() {
+ Key<Float> key = CameraCharacteristics.LENS_INFO_MINIMUM_FOCUS_DISTANCE;
+ Float minFocusDistance;
+
+ /**
+ * android.lens.info.minimumFocusDistance - required for FULL and MANUAL_SENSOR-capable
+ * devices; optional for all other devices.
+ */
+ if (isHardwareLevelFull() || isCapabilitySupported(
+ CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR)) {
+ minFocusDistance = getValueFromKeyNonNull(key);
+ } else {
+ minFocusDistance = mCharacteristics.get(key);
+ }
+
+ if (minFocusDistance == null) {
+ return 0.0f;
+ }
+
+ checkTrueForKey(key, " minFocusDistance value shouldn't be negative",
+ minFocusDistance >= 0);
+ if (minFocusDistance < 0) {
+ minFocusDistance = 0.0f;
+ }
+
+ return minFocusDistance;
+ }
+
+ /**
+ * Get focusDistanceCalibration.
+ *
+ * @return focusDistanceCalibration, UNCALIBRATED if value is invalid.
+ */
+ public int getFocusDistanceCalibrationChecked() {
+ Key<Integer> key = CameraCharacteristics.LENS_INFO_FOCUS_DISTANCE_CALIBRATION;
+ Integer calibration = getValueFromKeyNonNull(key);
+
+ if (calibration == null) {
+ return CameraMetadata.LENS_INFO_FOCUS_DISTANCE_CALIBRATION_UNCALIBRATED;
+ }
+
+ checkTrueForKey(key, " value is out of range" ,
+ calibration >= CameraMetadata.LENS_INFO_FOCUS_DISTANCE_CALIBRATION_UNCALIBRATED &&
+ calibration <= CameraMetadata.LENS_INFO_FOCUS_DISTANCE_CALIBRATION_CALIBRATED);
+
+ return calibration;
+ }
+
+ /**
+ * Get max AE regions and do sanity check.
+ *
+ * @return AE max regions supported by the camera device
+ */
+ public int getAeMaxRegionsChecked() {
+ Integer regionCount = mCharacteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AE);
+ if (regionCount == null) {
+ return 0;
+ }
+ return regionCount;
+ }
+
+ /**
+ * Get max AWB regions and do sanity check.
+ *
+ * @return AWB max regions supported by the camera device
+ */
+ public int getAwbMaxRegionsChecked() {
+ Integer regionCount = mCharacteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AWB);
+ if (regionCount == null) {
+ return 0;
+ }
+ return regionCount;
+ }
+
+ /**
+ * Get max AF regions and do sanity check.
+ *
+ * @return AF max regions supported by the camera device
+ */
+ public int getAfMaxRegionsChecked() {
+ Integer regionCount = mCharacteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AF);
+ if (regionCount == null) {
+ return 0;
+ }
+ return regionCount;
+ }
+ /**
+ * Get the available anti-banding modes.
+ *
+ * @return The array contains available anti-banding modes.
+ */
+ public int[] getAeAvailableAntiBandingModesChecked() {
+ Key<int[]> key = CameraCharacteristics.CONTROL_AE_AVAILABLE_ANTIBANDING_MODES;
+ int[] modes = getValueFromKeyNonNull(key);
+
+ boolean foundAuto = false;
+ boolean found50Hz = false;
+ boolean found60Hz = false;
+ for (int mode : modes) {
+ checkTrueForKey(key, "mode value " + mode + " is out if range",
+ mode >= CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_OFF ||
+ mode <= CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_AUTO);
+ if (mode == CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_AUTO) {
+ foundAuto = true;
+ } else if (mode == CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_50HZ) {
+ found50Hz = true;
+ } else if (mode == CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_60HZ) {
+ found60Hz = true;
+ }
+ }
+ // Must contain AUTO mode or one of 50/60Hz mode.
+ checkTrueForKey(key, "Either AUTO mode or both 50HZ/60HZ mode should present",
+ foundAuto || (found50Hz && found60Hz));
+
+ return modes;
+ }
+
+ /**
+ * Check if the antibanding OFF mode is supported.
+ *
+ * @return true if antibanding OFF mode is supported, false otherwise.
+ */
+ public boolean isAntiBandingOffModeSupported() {
+ List<Integer> antiBandingModes =
+ Arrays.asList(CameraTestUtils.toObject(getAeAvailableAntiBandingModesChecked()));
+
+ return antiBandingModes.contains(CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_OFF);
+ }
+
+ public Boolean getFlashInfoChecked() {
+ Key<Boolean> key = CameraCharacteristics.FLASH_INFO_AVAILABLE;
+ Boolean hasFlash = getValueFromKeyNonNull(key);
+
+ // In case the failOnKey only gives warning.
+ if (hasFlash == null) {
+ return false;
+ }
+
+ return hasFlash;
+ }
+
+ public int[] getAvailableTestPatternModesChecked() {
+ Key<int[]> key =
+ CameraCharacteristics.SENSOR_AVAILABLE_TEST_PATTERN_MODES;
+ int[] modes = getValueFromKeyNonNull(key);
+
+ if (modes == null) {
+ return new int[0];
+ }
+
+ int expectValue = CameraCharacteristics.SENSOR_TEST_PATTERN_MODE_OFF;
+ Integer[] boxedModes = CameraTestUtils.toObject(modes);
+ checkTrueForKey(key, " value must contain OFF mode",
+ Arrays.asList(boxedModes).contains(expectValue));
+
+ return modes;
+ }
+
+ /**
+ * Get available thumbnail sizes and do the sanity check.
+ *
+ * @return The array of available thumbnail sizes
+ */
+ public Size[] getAvailableThumbnailSizesChecked() {
+ Key<Size[]> key = CameraCharacteristics.JPEG_AVAILABLE_THUMBNAIL_SIZES;
+ Size[] sizes = getValueFromKeyNonNull(key);
+ final List<Size> sizeList = Arrays.asList(sizes);
+
+ // Size must contain (0, 0).
+ checkTrueForKey(key, "size should contain (0, 0)", sizeList.contains(new Size(0, 0)));
+
+ // Each size must be distinct.
+ checkElementDistinct(key, sizeList);
+
+ // Must be sorted in ascending order by area, by width if areas are same.
+ List<Size> orderedSizes =
+ CameraTestUtils.getAscendingOrderSizes(sizeList, /*ascending*/true);
+ checkTrueForKey(key, "Sizes should be in ascending order: Original " + sizeList.toString()
+ + ", Expected " + orderedSizes.toString(), orderedSizes.equals(sizeList));
+
+ // TODO: Aspect ratio match, need wait for android.scaler.availableStreamConfigurations
+ // implementation see b/12958122.
+
+ return sizes;
+ }
+
+ /**
+ * Get available focal lengths and do the sanity check.
+ *
+ * @return The array of available focal lengths
+ */
+ public float[] getAvailableFocalLengthsChecked() {
+ Key<float[]> key = CameraCharacteristics.LENS_INFO_AVAILABLE_FOCAL_LENGTHS;
+ float[] focalLengths = getValueFromKeyNonNull(key);
+
+ checkTrueForKey(key, "Array should contain at least one element", focalLengths.length >= 1);
+
+ for (int i = 0; i < focalLengths.length; i++) {
+ checkTrueForKey(key,
+ String.format("focalLength[%d] %f should be positive.", i, focalLengths[i]),
+ focalLengths[i] > 0);
+ }
+ checkElementDistinct(key, Arrays.asList(CameraTestUtils.toObject(focalLengths)));
+
+ return focalLengths;
+ }
+
+ /**
+ * Get available apertures and do the sanity check.
+ *
+ * @return The non-null array of available apertures
+ */
+ public float[] getAvailableAperturesChecked() {
+ Key<float[]> key = CameraCharacteristics.LENS_INFO_AVAILABLE_APERTURES;
+ float[] apertures = getValueFromKeyNonNull(key);
+
+ checkTrueForKey(key, "Array should contain at least one element", apertures.length >= 1);
+
+ for (int i = 0; i < apertures.length; i++) {
+ checkTrueForKey(key,
+ String.format("apertures[%d] %f should be positive.", i, apertures[i]),
+ apertures[i] > 0);
+ }
+ checkElementDistinct(key, Arrays.asList(CameraTestUtils.toObject(apertures)));
+
+ return apertures;
+ }
+
+ /**
+ * Get and check the available hot pixel map modes.
+ *
+ * @return the available hot pixel map modes
+ */
+ public int[] getAvailableHotPixelModesChecked() {
+ Key<int[]> key = CameraCharacteristics.HOT_PIXEL_AVAILABLE_HOT_PIXEL_MODES;
+ int[] modes = getValueFromKeyNonNull(key);
+
+ if (modes == null) {
+ return new int[0];
+ }
+
+ List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+ if (isHardwareLevelFull()) {
+ checkTrueForKey(key, "Full-capability camera devices must support FAST mode",
+ modeList.contains(CameraMetadata.HOT_PIXEL_MODE_FAST));
+ }
+
+ if (isHardwareLevelLimitedOrBetter()) {
+ // FAST and HIGH_QUALITY mode must be both present or both not present
+ List<Integer> coupledModes = Arrays.asList(new Integer[] {
+ CameraMetadata.HOT_PIXEL_MODE_FAST,
+ CameraMetadata.HOT_PIXEL_MODE_HIGH_QUALITY
+ });
+ checkTrueForKey(
+ key, " FAST and HIGH_QUALITY mode must both present or both not present",
+ containsAllOrNone(modeList, coupledModes));
+ }
+ checkElementDistinct(key, modeList);
+ checkArrayValuesInRange(key, modes, CameraMetadata.HOT_PIXEL_MODE_OFF,
+ CameraMetadata.HOT_PIXEL_MODE_HIGH_QUALITY);
+
+ return modes;
+ }
+
+ /**
+ * Get and check available face detection modes.
+ *
+ * @return The non-null array of available face detection modes
+ */
+ public int[] getAvailableFaceDetectModesChecked() {
+ Key<int[]> key = CameraCharacteristics.STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES;
+ int[] modes = getValueFromKeyNonNull(key);
+
+ if (modes == null) {
+ return new int[0];
+ }
+
+ List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+ checkTrueForKey(key, "Array should contain OFF mode",
+ modeList.contains(CameraMetadata.STATISTICS_FACE_DETECT_MODE_OFF));
+ checkElementDistinct(key, modeList);
+ checkArrayValuesInRange(key, modes, CameraMetadata.STATISTICS_FACE_DETECT_MODE_OFF,
+ CameraMetadata.STATISTICS_FACE_DETECT_MODE_FULL);
+
+ return modes;
+ }
+
+ /**
+ * Get and check max face detected count.
+ *
+ * @return max number of faces that can be detected
+ */
+ public int getMaxFaceCountChecked() {
+ Key<Integer> key = CameraCharacteristics.STATISTICS_INFO_MAX_FACE_COUNT;
+ Integer count = getValueFromKeyNonNull(key);
+
+ if (count == null) {
+ return 0;
+ }
+
+ List<Integer> faceDetectModes =
+ Arrays.asList(CameraTestUtils.toObject(getAvailableFaceDetectModesChecked()));
+ if (faceDetectModes.contains(CameraMetadata.STATISTICS_FACE_DETECT_MODE_OFF) &&
+ faceDetectModes.size() == 1) {
+ checkTrueForKey(key, " value must be 0 if only OFF mode is supported in "
+ + "availableFaceDetectionModes", count == 0);
+ } else {
+ int maxFaceCountAtLeast = STATISTICS_INFO_MAX_FACE_COUNT_MIN_AT_LEAST;
+
+ // Legacy mode may support fewer than STATISTICS_INFO_MAX_FACE_COUNT_MIN_AT_LEAST faces.
+ if (isHardwareLevelLegacy()) {
+ maxFaceCountAtLeast = 1;
+ }
+ checkTrueForKey(key, " value must be no less than " + maxFaceCountAtLeast + " if SIMPLE"
+ + "or FULL is also supported in availableFaceDetectionModes",
+ count >= maxFaceCountAtLeast);
+ }
+
+ return count;
+ }
+
+ /**
+ * Get and check the available tone map modes.
+ *
+ * @return the available tone map modes
+ */
+ public int[] getAvailableToneMapModesChecked() {
+ Key<int[]> key = CameraCharacteristics.TONEMAP_AVAILABLE_TONE_MAP_MODES;
+ int[] modes = getValueFromKeyNonNull(key);
+
+ if (modes == null) {
+ return new int[0];
+ }
+
+ List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+ checkTrueForKey(key, " Camera devices must always support FAST mode",
+ modeList.contains(CameraMetadata.TONEMAP_MODE_FAST));
+ // Qualification check for MANUAL_POSTPROCESSING capability is in
+ // StaticMetadataTest#testCapabilities
+
+ if (isHardwareLevelLimitedOrBetter()) {
+ // FAST and HIGH_QUALITY mode must be both present or both not present
+ List<Integer> coupledModes = Arrays.asList(new Integer[] {
+ CameraMetadata.TONEMAP_MODE_FAST,
+ CameraMetadata.TONEMAP_MODE_HIGH_QUALITY
+ });
+ checkTrueForKey(
+ key, " FAST and HIGH_QUALITY mode must both present or both not present",
+ containsAllOrNone(modeList, coupledModes));
+ }
+ checkElementDistinct(key, modeList);
+ checkArrayValuesInRange(key, modes, CameraMetadata.TONEMAP_MODE_CONTRAST_CURVE,
+ CameraMetadata.TONEMAP_MODE_PRESET_CURVE);
+
+ return modes;
+ }
+
+ /**
+ * Get and check max tonemap curve point.
+ *
+ * @return Max tonemap curve points.
+ */
+ public int getMaxTonemapCurvePointChecked() {
+ Key<Integer> key = CameraCharacteristics.TONEMAP_MAX_CURVE_POINTS;
+ Integer count = getValueFromKeyNonNull(key);
+ List<Integer> modeList =
+ Arrays.asList(CameraTestUtils.toObject(getAvailableToneMapModesChecked()));
+ boolean tonemapCurveOutputSupported =
+ modeList.contains(CameraMetadata.TONEMAP_MODE_CONTRAST_CURVE) ||
+ modeList.contains(CameraMetadata.TONEMAP_MODE_GAMMA_VALUE) ||
+ modeList.contains(CameraMetadata.TONEMAP_MODE_PRESET_CURVE);
+
+ if (count == null) {
+ if (tonemapCurveOutputSupported) {
+ Assert.fail("Tonemap curve output is supported but MAX_CURVE_POINTS is null");
+ }
+ return 0;
+ }
+
+ if (tonemapCurveOutputSupported) {
+ checkTrueForKey(key, "Tonemap curve output supported camera device must support "
+ + "maxCurvePoints >= " + TONEMAP_MAX_CURVE_POINTS_AT_LEAST,
+ count >= TONEMAP_MAX_CURVE_POINTS_AT_LEAST);
+ }
+
+ return count;
+ }
+
+ /**
+ * Get and check pixel array size.
+ */
+ public Size getPixelArraySizeChecked() {
+ Key<Size> key = CameraCharacteristics.SENSOR_INFO_PIXEL_ARRAY_SIZE;
+ Size pixelArray = getValueFromKeyNonNull(key);
+ if (pixelArray == null) {
+ return new Size(0, 0);
+ }
+
+ return pixelArray;
+ }
+
+ /**
+ * Get and check pre-correction active array size.
+ */
+ public Rect getPreCorrectedActiveArraySizeChecked() {
+ Key<Rect> key = CameraCharacteristics.SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE;
+ Rect activeArray = getValueFromKeyNonNull(key);
+
+ if (activeArray == null) {
+ return new Rect(0, 0, 0, 0);
+ }
+
+ Size pixelArraySize = getPixelArraySizeChecked();
+ checkTrueForKey(key, "values left/top are invalid", activeArray.left >= 0 && activeArray.top >= 0);
+ checkTrueForKey(key, "values width/height are invalid",
+ activeArray.width() <= pixelArraySize.getWidth() &&
+ activeArray.height() <= pixelArraySize.getHeight());
+
+ return activeArray;
+ }
+
+ /**
+ * Get and check active array size.
+ */
+ public Rect getActiveArraySizeChecked() {
+ Key<Rect> key = CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE;
+ Rect activeArray = getValueFromKeyNonNull(key);
+
+ if (activeArray == null) {
+ return new Rect(0, 0, 0, 0);
+ }
+
+ Size pixelArraySize = getPixelArraySizeChecked();
+ checkTrueForKey(key, "values left/top are invalid", activeArray.left >= 0 && activeArray.top >= 0);
+ checkTrueForKey(key, "values width/height are invalid",
+ activeArray.width() <= pixelArraySize.getWidth() &&
+ activeArray.height() <= pixelArraySize.getHeight());
+
+ return activeArray;
+ }
+
+ /**
+ * Get the dimensions to use for RAW16 buffers.
+ */
+ public Size getRawDimensChecked() throws Exception {
+ Size[] targetCaptureSizes = getAvailableSizesForFormatChecked(ImageFormat.RAW_SENSOR,
+ StaticMetadata.StreamDirection.Output);
+ Assert.assertTrue("No capture sizes available for RAW format!",
+ targetCaptureSizes.length != 0);
+ Rect activeArray = getPreCorrectedActiveArraySizeChecked();
+ Size preCorrectionActiveArraySize =
+ new Size(activeArray.width(), activeArray.height());
+ Size pixelArraySize = getPixelArraySizeChecked();
+ Assert.assertTrue("Missing pre-correction active array size", activeArray.width() > 0 &&
+ activeArray.height() > 0);
+ Assert.assertTrue("Missing pixel array size", pixelArraySize.getWidth() > 0 &&
+ pixelArraySize.getHeight() > 0);
+ Size[] allowedArraySizes = new Size[] { preCorrectionActiveArraySize,
+ pixelArraySize };
+ return assertArrayContainsAnyOf("Available sizes for RAW format" +
+ " must include either the pre-corrected active array size, or the full " +
+ "pixel array size", targetCaptureSizes, allowedArraySizes);
+ }
+
+ /**
+ * Get the sensitivity value and clamp to the range if needed.
+ *
+ * @param sensitivity Input sensitivity value to check.
+ * @return Sensitivity value in legal range.
+ */
+ public int getSensitivityClampToRange(int sensitivity) {
+ int minSensitivity = getSensitivityMinimumOrDefault(Integer.MAX_VALUE);
+ int maxSensitivity = getSensitivityMaximumOrDefault(Integer.MIN_VALUE);
+ if (minSensitivity > SENSOR_INFO_SENSITIVITY_RANGE_MIN_AT_MOST) {
+ failKeyCheck(CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE,
+ String.format(
+ "Min value %d is too large, set to maximal legal value %d",
+ minSensitivity, SENSOR_INFO_SENSITIVITY_RANGE_MIN_AT_MOST));
+ minSensitivity = SENSOR_INFO_SENSITIVITY_RANGE_MIN_AT_MOST;
+ }
+ if (maxSensitivity < SENSOR_INFO_SENSITIVITY_RANGE_MAX_AT_LEAST) {
+ failKeyCheck(CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE,
+ String.format(
+ "Max value %d is too small, set to minimal legal value %d",
+ maxSensitivity, SENSOR_INFO_SENSITIVITY_RANGE_MAX_AT_LEAST));
+ maxSensitivity = SENSOR_INFO_SENSITIVITY_RANGE_MAX_AT_LEAST;
+ }
+
+ return Math.max(minSensitivity, Math.min(maxSensitivity, sensitivity));
+ }
+
+ /**
+ * Get maxAnalogSensitivity for a camera device.
+ * <p>
+ * This is only available for FULL capability device, return 0 if it is unavailable.
+ * </p>
+ *
+ * @return maxAnalogSensitivity, 0 if it is not available.
+ */
+ public int getMaxAnalogSensitivityChecked() {
+
+ Key<Integer> key = CameraCharacteristics.SENSOR_MAX_ANALOG_SENSITIVITY;
+ Integer maxAnalogsensitivity = mCharacteristics.get(key);
+ if (maxAnalogsensitivity == null) {
+ if (isHardwareLevelFull()) {
+ Assert.fail("Full device should report max analog sensitivity");
+ }
+ return 0;
+ }
+
+ int minSensitivity = getSensitivityMinimumOrDefault();
+ int maxSensitivity = getSensitivityMaximumOrDefault();
+ checkTrueForKey(key, " Max analog sensitivity " + maxAnalogsensitivity
+ + " should be no larger than max sensitivity " + maxSensitivity,
+ maxAnalogsensitivity <= maxSensitivity);
+ checkTrueForKey(key, " Max analog sensitivity " + maxAnalogsensitivity
+ + " should be larger than min sensitivity " + maxSensitivity,
+ maxAnalogsensitivity > minSensitivity);
+
+ return maxAnalogsensitivity;
+ }
+
+ /**
+ * Get hyperfocalDistance and do the sanity check.
+ * <p>
+ * Note that, this tag is optional, will return -1 if this tag is not
+ * available.
+ * </p>
+ *
+ * @return hyperfocalDistance of this device, -1 if this tag is not available.
+ */
+ public float getHyperfocalDistanceChecked() {
+ Key<Float> key = CameraCharacteristics.LENS_INFO_HYPERFOCAL_DISTANCE;
+ Float hyperfocalDistance = getValueFromKeyNonNull(key);
+ if (hyperfocalDistance == null) {
+ return -1;
+ }
+
+ if (hasFocuser()) {
+ float minFocusDistance = getMinimumFocusDistanceChecked();
+ checkTrueForKey(key, String.format(" hyperfocal distance %f should be in the range of"
+ + " should be in the range of (%f, %f]", hyperfocalDistance, 0.0f,
+ minFocusDistance),
+ hyperfocalDistance > 0 && hyperfocalDistance <= minFocusDistance);
+ }
+
+ return hyperfocalDistance;
+ }
+
+ /**
+ * Get the minimum value for a sensitivity range from android.sensor.info.sensitivityRange.
+ *
+ * <p>If the camera is incorrectly reporting values, log a warning and return
+ * the default value instead, which is the largest minimum value required to be supported
+ * by all camera devices.</p>
+ *
+ * @return The value reported by the camera device or the defaultValue otherwise.
+ */
+ public int getSensitivityMinimumOrDefault() {
+ return getSensitivityMinimumOrDefault(SENSOR_INFO_SENSITIVITY_RANGE_MIN_AT_MOST);
+ }
+
+ /**
+ * Get the minimum value for a sensitivity range from android.sensor.info.sensitivityRange.
+ *
+ * <p>If the camera is incorrectly reporting values, log a warning and return
+ * the default value instead.</p>
+ *
+ * @param defaultValue Value to return if no legal value is available
+ * @return The value reported by the camera device or the defaultValue otherwise.
+ */
+ public int getSensitivityMinimumOrDefault(int defaultValue) {
+ Range<Integer> range = getValueFromKeyNonNull(
+ CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE);
+ if (range == null) {
+ failKeyCheck(CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE,
+ "had no valid minimum value; using default of " + defaultValue);
+ return defaultValue;
+ }
+ return range.getLower();
+ }
+
+ /**
+ * Get the maximum value for a sensitivity range from android.sensor.info.sensitivityRange.
+ *
+ * <p>If the camera is incorrectly reporting values, log a warning and return
+ * the default value instead, which is the smallest maximum value required to be supported
+ * by all camera devices.</p>
+ *
+ * @return The value reported by the camera device or the defaultValue otherwise.
+ */
+ public int getSensitivityMaximumOrDefault() {
+ return getSensitivityMaximumOrDefault(SENSOR_INFO_SENSITIVITY_RANGE_MAX_AT_LEAST);
+ }
+
+ /**
+ * Get the maximum value for a sensitivity range from android.sensor.info.sensitivityRange.
+ *
+ * <p>If the camera is incorrectly reporting values, log a warning and return
+ * the default value instead.</p>
+ *
+ * @param defaultValue Value to return if no legal value is available
+ * @return The value reported by the camera device or the defaultValue otherwise.
+ */
+ public int getSensitivityMaximumOrDefault(int defaultValue) {
+ Range<Integer> range = getValueFromKeyNonNull(
+ CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE);
+ if (range == null) {
+ failKeyCheck(CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE,
+ "had no valid maximum value; using default of " + defaultValue);
+ return defaultValue;
+ }
+ return range.getUpper();
+ }
+
+ /**
+ * Get the minimum value for an exposure range from android.sensor.info.exposureTimeRange.
+ *
+ * <p>If the camera is incorrectly reporting values, log a warning and return
+ * the default value instead.</p>
+ *
+ * @param defaultValue Value to return if no legal value is available
+ * @return The value reported by the camera device or the defaultValue otherwise.
+ */
+ public long getExposureMinimumOrDefault(long defaultValue) {
+ Range<Long> range = getValueFromKeyNonNull(
+ CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE);
+ if (range == null) {
+ failKeyCheck(CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE,
+ "had no valid minimum value; using default of " + defaultValue);
+ return defaultValue;
+ }
+ return range.getLower();
+ }
+
+ /**
+ * Get the minimum value for an exposure range from android.sensor.info.exposureTimeRange.
+ *
+ * <p>If the camera is incorrectly reporting values, log a warning and return
+ * the default value instead, which is the largest minimum value required to be supported
+ * by all camera devices.</p>
+ *
+ * @return The value reported by the camera device or the defaultValue otherwise.
+ */
+ public long getExposureMinimumOrDefault() {
+ return getExposureMinimumOrDefault(SENSOR_INFO_EXPOSURE_TIME_RANGE_MIN_AT_MOST);
+ }
+
+ /**
+ * Get the maximum value for an exposure range from android.sensor.info.exposureTimeRange.
+ *
+ * <p>If the camera is incorrectly reporting values, log a warning and return
+ * the default value instead.</p>
+ *
+ * @param defaultValue Value to return if no legal value is available
+ * @return The value reported by the camera device or the defaultValue otherwise.
+ */
+ public long getExposureMaximumOrDefault(long defaultValue) {
+ Range<Long> range = getValueFromKeyNonNull(
+ CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE);
+ if (range == null) {
+ failKeyCheck(CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE,
+ "had no valid maximum value; using default of " + defaultValue);
+ return defaultValue;
+ }
+ return range.getUpper();
+ }
+
+ /**
+ * Get the maximum value for an exposure range from android.sensor.info.exposureTimeRange.
+ *
+ * <p>If the camera is incorrectly reporting values, log a warning and return
+ * the default value instead, which is the smallest maximum value required to be supported
+ * by all camera devices.</p>
+ *
+ * @return The value reported by the camera device or the defaultValue otherwise.
+ */
+ public long getExposureMaximumOrDefault() {
+ return getExposureMaximumOrDefault(SENSOR_INFO_EXPOSURE_TIME_RANGE_MAX_AT_LEAST);
+ }
+
+ /**
+ * get android.control.availableModes and do the sanity check.
+ *
+ * @return available control modes.
+ */
+ public int[] getAvailableControlModesChecked() {
+ Key<int[]> modesKey = CameraCharacteristics.CONTROL_AVAILABLE_MODES;
+ int[] modes = getValueFromKeyNonNull(modesKey);
+ if (modes == null) {
+ modes = new int[0];
+ }
+
+ List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+ checkTrueForKey(modesKey, "value is empty", !modeList.isEmpty());
+
+ // All camera device must support AUTO
+ checkTrueForKey(modesKey, "values " + modeList.toString() + " must contain AUTO mode",
+ modeList.contains(CameraMetadata.CONTROL_MODE_AUTO));
+
+ boolean isAeOffSupported = Arrays.asList(
+ CameraTestUtils.toObject(getAeAvailableModesChecked())).contains(
+ CameraMetadata.CONTROL_AE_MODE_OFF);
+ boolean isAfOffSupported = Arrays.asList(
+ CameraTestUtils.toObject(getAfAvailableModesChecked())).contains(
+ CameraMetadata.CONTROL_AF_MODE_OFF);
+ boolean isAwbOffSupported = Arrays.asList(
+ CameraTestUtils.toObject(getAwbAvailableModesChecked())).contains(
+ CameraMetadata.CONTROL_AWB_MODE_OFF);
+ if (isAeOffSupported && isAfOffSupported && isAwbOffSupported) {
+ // 3A OFF controls are supported, OFF mode must be supported here.
+ checkTrueForKey(modesKey, "values " + modeList.toString() + " must contain OFF mode",
+ modeList.contains(CameraMetadata.CONTROL_MODE_OFF));
+ }
+
+ if (isSceneModeSupported()) {
+ checkTrueForKey(modesKey, "values " + modeList.toString() + " must contain"
+ + " USE_SCENE_MODE",
+ modeList.contains(CameraMetadata.CONTROL_MODE_USE_SCENE_MODE));
+ }
+
+ return modes;
+ }
+
+ public boolean isSceneModeSupported() {
+ List<Integer> availableSceneModes = Arrays.asList(
+ CameraTestUtils.toObject(getAvailableSceneModesChecked()));
+
+ if (availableSceneModes.isEmpty()) {
+ return false;
+ }
+
+ // If sceneMode is not supported, camera device will contain single entry: DISABLED.
+ return availableSceneModes.size() > 1 ||
+ !availableSceneModes.contains(CameraMetadata.CONTROL_SCENE_MODE_DISABLED);
+ }
+
+ /**
+ * Get aeAvailableModes and do the sanity check.
+ *
+ * <p>Depending on the check level this class has, for WAR or COLLECT levels,
+ * If the aeMode list is invalid, return an empty mode array. The the caller doesn't
+ * have to abort the execution even the aeMode list is invalid.</p>
+ * @return AE available modes
+ */
+ public int[] getAeAvailableModesChecked() {
+ Key<int[]> modesKey = CameraCharacteristics.CONTROL_AE_AVAILABLE_MODES;
+ int[] modes = getValueFromKeyNonNull(modesKey);
+ if (modes == null) {
+ modes = new int[0];
+ }
+ List<Integer> modeList = new ArrayList<Integer>();
+ for (int mode : modes) {
+ modeList.add(mode);
+ }
+ checkTrueForKey(modesKey, "value is empty", !modeList.isEmpty());
+
+ // All camera device must support ON
+ checkTrueForKey(modesKey, "values " + modeList.toString() + " must contain ON mode",
+ modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON));
+
+ // All camera devices with flash units support ON_AUTO_FLASH and ON_ALWAYS_FLASH
+ Key<Boolean> flashKey= CameraCharacteristics.FLASH_INFO_AVAILABLE;
+ Boolean hasFlash = getValueFromKeyNonNull(flashKey);
+ if (hasFlash == null) {
+ hasFlash = false;
+ }
+ if (hasFlash) {
+ boolean flashModeConsistentWithFlash =
+ modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH) &&
+ modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON_ALWAYS_FLASH);
+ checkTrueForKey(modesKey,
+ "value must contain ON_AUTO_FLASH and ON_ALWAYS_FLASH and when flash is" +
+ "available", flashModeConsistentWithFlash);
+ } else {
+ boolean flashModeConsistentWithoutFlash =
+ !(modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH) ||
+ modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON_ALWAYS_FLASH) ||
+ modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE));
+ checkTrueForKey(modesKey,
+ "value must not contain ON_AUTO_FLASH, ON_ALWAYS_FLASH and" +
+ "ON_AUTO_FLASH_REDEYE when flash is unavailable",
+ flashModeConsistentWithoutFlash);
+ }
+
+ // FULL mode camera devices always support OFF mode.
+ boolean condition =
+ !isHardwareLevelFull() || modeList.contains(CameraMetadata.CONTROL_AE_MODE_OFF);
+ checkTrueForKey(modesKey, "Full capability device must have OFF mode", condition);
+
+ // Boundary check.
+ for (int mode : modes) {
+ checkTrueForKey(modesKey, "Value " + mode + " is out of bound",
+ mode >= CameraMetadata.CONTROL_AE_MODE_OFF
+ && mode <= CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE);
+ }
+
+ return modes;
+ }
+
+ /**
+ * Get available AWB modes and do the sanity check.
+ *
+ * @return array that contains available AWB modes, empty array if awbAvailableModes is
+ * unavailable.
+ */
+ public int[] getAwbAvailableModesChecked() {
+ Key<int[]> key =
+ CameraCharacteristics.CONTROL_AWB_AVAILABLE_MODES;
+ int[] awbModes = getValueFromKeyNonNull(key);
+
+ if (awbModes == null) {
+ return new int[0];
+ }
+
+ List<Integer> modesList = Arrays.asList(CameraTestUtils.toObject(awbModes));
+ checkTrueForKey(key, " All camera devices must support AUTO mode",
+ modesList.contains(CameraMetadata.CONTROL_AWB_MODE_AUTO));
+ if (isHardwareLevelFull()) {
+ checkTrueForKey(key, " Full capability camera devices must support OFF mode",
+ modesList.contains(CameraMetadata.CONTROL_AWB_MODE_OFF));
+ }
+
+ return awbModes;
+ }
+
+ /**
+ * Get available AF modes and do the sanity check.
+ *
+ * @return array that contains available AF modes, empty array if afAvailableModes is
+ * unavailable.
+ */
+ public int[] getAfAvailableModesChecked() {
+ Key<int[]> key =
+ CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES;
+ int[] afModes = getValueFromKeyNonNull(key);
+
+ if (afModes == null) {
+ return new int[0];
+ }
+
+ List<Integer> modesList = Arrays.asList(CameraTestUtils.toObject(afModes));
+ if (isHardwareLevelLimitedOrBetter()) {
+ // Some LEGACY mode devices do not support AF OFF
+ checkTrueForKey(key, " All camera devices must support OFF mode",
+ modesList.contains(CameraMetadata.CONTROL_AF_MODE_OFF));
+ }
+ if (hasFocuser()) {
+ checkTrueForKey(key, " Camera devices that have focuser units must support AUTO mode",
+ modesList.contains(CameraMetadata.CONTROL_AF_MODE_AUTO));
+ }
+
+ return afModes;
+ }
+
+ /**
+ * Get supported raw output sizes and do the check.
+ *
+ * @return Empty size array if raw output is not supported
+ */
+ public Size[] getRawOutputSizesChecked() {
+ return getAvailableSizesForFormatChecked(ImageFormat.RAW_SENSOR,
+ StreamDirection.Output);
+ }
+
+ /**
+ * Get supported jpeg output sizes and do the check.
+ *
+ * @return Empty size array if jpeg output is not supported
+ */
+ public Size[] getJpegOutputSizesChecked() {
+ return getAvailableSizesForFormatChecked(ImageFormat.JPEG,
+ StreamDirection.Output);
+ }
+
+ /**
+ * Used to determine the stream direction for various helpers that look up
+ * format or size information.
+ */
+ public enum StreamDirection {
+ /** Stream is used with {@link android.hardware.camera2.CameraDevice#configureOutputs} */
+ Output,
+ /** Stream is used with {@code CameraDevice#configureInputs} -- NOT YET PUBLIC */
+ Input
+ }
+
+ /**
+ * Get available formats for a given direction.
+ *
+ * @param direction The stream direction, input or output.
+ * @return The formats of the given direction, empty array if no available format is found.
+ */
+ public int[] getAvailableFormats(StreamDirection direction) {
+ Key<StreamConfigurationMap> key =
+ CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP;
+ StreamConfigurationMap config = getValueFromKeyNonNull(key);
+
+ if (config == null) {
+ return new int[0];
+ }
+
+ switch (direction) {
+ case Output:
+ return config.getOutputFormats();
+ case Input:
+ return config.getInputFormats();
+ default:
+ throw new IllegalArgumentException("direction must be output or input");
+ }
+ }
+
+ /**
+ * Get valid output formats for a given input format.
+ *
+ * @param inputFormat The input format used to produce the output images.
+ * @return The output formats for the given input format, empty array if
+ * no available format is found.
+ */
+ public int[] getValidOutputFormatsForInput(int inputFormat) {
+ Key<StreamConfigurationMap> key =
+ CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP;
+ StreamConfigurationMap config = getValueFromKeyNonNull(key);
+
+ if (config == null) {
+ return new int[0];
+ }
+
+ return config.getValidOutputFormatsForInput(inputFormat);
+ }
+
+ /**
+ * Get available sizes for given format and direction.
+ *
+ * @param format The format for the requested size array.
+ * @param direction The stream direction, input or output.
+ * @return The sizes of the given format, empty array if no available size is found.
+ */
+ public Size[] getAvailableSizesForFormatChecked(int format, StreamDirection direction) {
+ return getAvailableSizesForFormatChecked(format, direction,
+ /*fastSizes*/true, /*slowSizes*/true);
+ }
+
+ /**
+ * Get available sizes for given format and direction, and whether to limit to slow or fast
+ * resolutions.
+ *
+ * @param format The format for the requested size array.
+ * @param direction The stream direction, input or output.
+ * @param fastSizes whether to include getOutputSizes() sizes (generally faster)
+ * @param slowSizes whether to include getHighResolutionOutputSizes() sizes (generally slower)
+ * @return The sizes of the given format, empty array if no available size is found.
+ */
+ public Size[] getAvailableSizesForFormatChecked(int format, StreamDirection direction,
+ boolean fastSizes, boolean slowSizes) {
+ Key<StreamConfigurationMap> key =
+ CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP;
+ StreamConfigurationMap config = getValueFromKeyNonNull(key);
+
+ if (config == null) {
+ return new Size[0];
+ }
+
+ Size[] sizes = null;
+
+ switch (direction) {
+ case Output:
+ Size[] fastSizeList = null;
+ Size[] slowSizeList = null;
+ if (fastSizes) {
+ fastSizeList = config.getOutputSizes(format);
+ }
+ if (slowSizes) {
+ slowSizeList = config.getHighResolutionOutputSizes(format);
+ }
+ if (fastSizeList != null && slowSizeList != null) {
+ sizes = new Size[slowSizeList.length + fastSizeList.length];
+ System.arraycopy(fastSizeList, 0, sizes, 0, fastSizeList.length);
+ System.arraycopy(slowSizeList, 0, sizes, fastSizeList.length, slowSizeList.length);
+ } else if (fastSizeList != null) {
+ sizes = fastSizeList;
+ } else if (slowSizeList != null) {
+ sizes = slowSizeList;
+ }
+ break;
+ case Input:
+ sizes = config.getInputSizes(format);
+ break;
+ default:
+ throw new IllegalArgumentException("direction must be output or input");
+ }
+
+ if (sizes == null) {
+ sizes = new Size[0];
+ }
+
+ return sizes;
+ }
+
+ /**
+ * Get available AE target fps ranges.
+ *
+ * @return Empty int array if aeAvailableTargetFpsRanges is invalid.
+ */
+ @SuppressWarnings("raw")
+ public Range<Integer>[] getAeAvailableTargetFpsRangesChecked() {
+ Key<Range<Integer>[]> key =
+ CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES;
+ Range<Integer>[] fpsRanges = getValueFromKeyNonNull(key);
+
+ if (fpsRanges == null) {
+ return new Range[0];
+ }
+
+ // Round down to 2 boundary if it is not integer times of 2, to avoid array out of bound
+ // in case the above check fails.
+ int fpsRangeLength = fpsRanges.length;
+ int minFps, maxFps;
+ long maxFrameDuration = getMaxFrameDurationChecked();
+ for (int i = 0; i < fpsRangeLength; i += 1) {
+ minFps = fpsRanges[i].getLower();
+ maxFps = fpsRanges[i].getUpper();
+ checkTrueForKey(key, " min fps must be no larger than max fps!",
+ minFps > 0 && maxFps >= minFps);
+ long maxDuration = (long) (1e9 / minFps);
+ checkTrueForKey(key, String.format(
+ " the frame duration %d for min fps %d must smaller than maxFrameDuration %d",
+ maxDuration, minFps, maxFrameDuration), maxDuration <= maxFrameDuration);
+ }
+ return fpsRanges;
+ }
+
+ /**
+ * Get the highest supported target FPS range.
+ * Prioritizes maximizing the min FPS, then the max FPS without lowering min FPS.
+ */
+ public Range<Integer> getAeMaxTargetFpsRange() {
+ Range<Integer>[] fpsRanges = getAeAvailableTargetFpsRangesChecked();
+
+ Range<Integer> targetRange = fpsRanges[0];
+ // Assume unsorted list of target FPS ranges, so use two passes, first maximize min FPS
+ for (Range<Integer> candidateRange : fpsRanges) {
+ if (candidateRange.getLower() > targetRange.getLower()) {
+ targetRange = candidateRange;
+ }
+ }
+ // Then maximize max FPS while not lowering min FPS
+ for (Range<Integer> candidateRange : fpsRanges) {
+ if (candidateRange.getLower() >= targetRange.getLower() &&
+ candidateRange.getUpper() > targetRange.getUpper()) {
+ targetRange = candidateRange;
+ }
+ }
+ return targetRange;
+ }
+
+ /**
+ * Get max frame duration.
+ *
+ * @return 0 if maxFrameDuration is null
+ */
+ public long getMaxFrameDurationChecked() {
+ Key<Long> key =
+ CameraCharacteristics.SENSOR_INFO_MAX_FRAME_DURATION;
+ Long maxDuration = getValueFromKeyNonNull(key);
+
+ if (maxDuration == null) {
+ return 0;
+ }
+
+ return maxDuration;
+ }
+
+ /**
+ * Get available minimal frame durations for a given format.
+ *
+ * @param format One of the format from {@link ImageFormat}.
+ * @return HashMap of minimal frame durations for different sizes, empty HashMap
+ * if availableMinFrameDurations is null.
+ */
+ public HashMap<Size, Long> getAvailableMinFrameDurationsForFormatChecked(int format) {
+
+ HashMap<Size, Long> minDurationMap = new HashMap<Size, Long>();
+
+ Key<StreamConfigurationMap> key =
+ CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP;
+ StreamConfigurationMap config = getValueFromKeyNonNull(key);
+
+ if (config == null) {
+ return minDurationMap;
+ }
+
+ for (Size size : getAvailableSizesForFormatChecked(format,
+ StreamDirection.Output)) {
+ long minFrameDuration = config.getOutputMinFrameDuration(format, size);
+
+ if (minFrameDuration != 0) {
+ minDurationMap.put(new Size(size.getWidth(), size.getHeight()), minFrameDuration);
+ }
+ }
+
+ return minDurationMap;
+ }
+
+ public int[] getAvailableEdgeModesChecked() {
+ Key<int[]> key = CameraCharacteristics.EDGE_AVAILABLE_EDGE_MODES;
+ int[] edgeModes = getValueFromKeyNonNull(key);
+
+ if (edgeModes == null) {
+ return new int[0];
+ }
+
+ List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(edgeModes));
+ // Full device should always include OFF and FAST
+ if (isHardwareLevelFull()) {
+ checkTrueForKey(key, "Full device must contain OFF and FAST edge modes",
+ modeList.contains(CameraMetadata.EDGE_MODE_OFF) &&
+ modeList.contains(CameraMetadata.EDGE_MODE_FAST));
+ }
+
+ if (isHardwareLevelLimitedOrBetter()) {
+ // FAST and HIGH_QUALITY mode must be both present or both not present
+ List<Integer> coupledModes = Arrays.asList(new Integer[] {
+ CameraMetadata.EDGE_MODE_FAST,
+ CameraMetadata.EDGE_MODE_HIGH_QUALITY
+ });
+ checkTrueForKey(
+ key, " FAST and HIGH_QUALITY mode must both present or both not present",
+ containsAllOrNone(modeList, coupledModes));
+ }
+
+ return edgeModes;
+ }
+
+ public int[] getAvailableNoiseReductionModesChecked() {
+ Key<int[]> key =
+ CameraCharacteristics.NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES;
+ int[] noiseReductionModes = getValueFromKeyNonNull(key);
+
+ if (noiseReductionModes == null) {
+ return new int[0];
+ }
+
+ List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(noiseReductionModes));
+ // Full device should always include OFF and FAST
+ if (isHardwareLevelFull()) {
+
+ checkTrueForKey(key, "Full device must contain OFF and FAST noise reduction modes",
+ modeList.contains(CameraMetadata.NOISE_REDUCTION_MODE_OFF) &&
+ modeList.contains(CameraMetadata.NOISE_REDUCTION_MODE_FAST));
+ }
+
+ if (isHardwareLevelLimitedOrBetter()) {
+ // FAST and HIGH_QUALITY mode must be both present or both not present
+ List<Integer> coupledModes = Arrays.asList(new Integer[] {
+ CameraMetadata.NOISE_REDUCTION_MODE_FAST,
+ CameraMetadata.NOISE_REDUCTION_MODE_HIGH_QUALITY
+ });
+ checkTrueForKey(
+ key, " FAST and HIGH_QUALITY mode must both present or both not present",
+ containsAllOrNone(modeList, coupledModes));
+ }
+ return noiseReductionModes;
+ }
+
+ /**
+ * Get value of key android.control.aeCompensationStep and do the sanity check.
+ *
+ * @return default value if the value is null.
+ */
+ public Rational getAeCompensationStepChecked() {
+ Key<Rational> key =
+ CameraCharacteristics.CONTROL_AE_COMPENSATION_STEP;
+ Rational compensationStep = getValueFromKeyNonNull(key);
+
+ if (compensationStep == null) {
+ // Return default step.
+ return CONTROL_AE_COMPENSATION_STEP_DEFAULT;
+ }
+
+ // Legacy devices don't have a minimum step requirement
+ if (isHardwareLevelLimitedOrBetter()) {
+ float compensationStepF =
+ (float) compensationStep.getNumerator() / compensationStep.getDenominator();
+ checkTrueForKey(key, " value must be no more than 1/2", compensationStepF <= 0.5f);
+ }
+
+ return compensationStep;
+ }
+
+ /**
+ * Get value of key android.control.aeCompensationRange and do the sanity check.
+ *
+ * @return default value if the value is null or malformed.
+ */
+ public Range<Integer> getAeCompensationRangeChecked() {
+ Key<Range<Integer>> key =
+ CameraCharacteristics.CONTROL_AE_COMPENSATION_RANGE;
+ Range<Integer> compensationRange = getValueFromKeyNonNull(key);
+ Rational compensationStep = getAeCompensationStepChecked();
+ float compensationStepF = compensationStep.floatValue();
+ final Range<Integer> DEFAULT_RANGE = Range.create(
+ (int)(CONTROL_AE_COMPENSATION_RANGE_DEFAULT_MIN / compensationStepF),
+ (int)(CONTROL_AE_COMPENSATION_RANGE_DEFAULT_MAX / compensationStepF));
+ final Range<Integer> ZERO_RANGE = Range.create(0, 0);
+ if (compensationRange == null) {
+ return ZERO_RANGE;
+ }
+
+ // Legacy devices don't have a minimum range requirement
+ if (isHardwareLevelLimitedOrBetter() && !compensationRange.equals(ZERO_RANGE)) {
+ checkTrueForKey(key, " range value must be at least " + DEFAULT_RANGE
+ + ", actual " + compensationRange + ", compensation step " + compensationStep,
+ compensationRange.getLower() <= DEFAULT_RANGE.getLower() &&
+ compensationRange.getUpper() >= DEFAULT_RANGE.getUpper());
+ }
+
+ return compensationRange;
+ }
+
+ /**
+ * Get availableVideoStabilizationModes and do the sanity check.
+ *
+ * @return available video stabilization modes, empty array if it is unavailable.
+ */
+ public int[] getAvailableVideoStabilizationModesChecked() {
+ Key<int[]> key =
+ CameraCharacteristics.CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES;
+ int[] modes = getValueFromKeyNonNull(key);
+
+ if (modes == null) {
+ return new int[0];
+ }
+
+ List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+ checkTrueForKey(key, " All device should support OFF mode",
+ modeList.contains(CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_OFF));
+ checkArrayValuesInRange(key, modes,
+ CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_OFF,
+ CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_ON);
+
+ return modes;
+ }
+
+ public boolean isVideoStabilizationSupported() {
+ Integer[] videoStabModes =
+ CameraTestUtils.toObject(getAvailableVideoStabilizationModesChecked());
+ return Arrays.asList(videoStabModes).contains(
+ CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_ON);
+ }
+
+ /**
+ * Get availableOpticalStabilization and do the sanity check.
+ *
+ * @return available optical stabilization modes, empty array if it is unavailable.
+ */
+ public int[] getAvailableOpticalStabilizationChecked() {
+ Key<int[]> key =
+ CameraCharacteristics.LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION;
+ int[] modes = getValueFromKeyNonNull(key);
+
+ if (modes == null) {
+ return new int[0];
+ }
+
+ checkArrayValuesInRange(key, modes,
+ CameraMetadata.LENS_OPTICAL_STABILIZATION_MODE_OFF,
+ CameraMetadata.LENS_OPTICAL_STABILIZATION_MODE_ON);
+
+ return modes;
+ }
+
+ /**
+ * Get the scaler's max digital zoom ({@code >= 1.0f}) ratio between crop and active array
+ * @return the max zoom ratio, or {@code 1.0f} if the value is unavailable
+ */
+ public float getAvailableMaxDigitalZoomChecked() {
+ Key<Float> key =
+ CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM;
+
+ Float maxZoom = getValueFromKeyNonNull(key);
+ if (maxZoom == null) {
+ return 1.0f;
+ }
+
+ checkTrueForKey(key, " max digital zoom should be no less than 1",
+ maxZoom >= 1.0f && !Float.isNaN(maxZoom) && !Float.isInfinite(maxZoom));
+
+ return maxZoom;
+ }
+
+ public int[] getAvailableSceneModesChecked() {
+ Key<int[]> key =
+ CameraCharacteristics.CONTROL_AVAILABLE_SCENE_MODES;
+ int[] modes = getValueFromKeyNonNull(key);
+
+ if (modes == null) {
+ return new int[0];
+ }
+
+ List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+ // FACE_PRIORITY must be included if face detection is supported.
+ if (areKeysAvailable(CameraCharacteristics.STATISTICS_INFO_MAX_FACE_COUNT) &&
+ getMaxFaceCountChecked() > 0) {
+ checkTrueForKey(key, " FACE_PRIORITY must be included if face detection is supported",
+ modeList.contains(CameraMetadata.CONTROL_SCENE_MODE_FACE_PRIORITY));
+ }
+
+ return modes;
+ }
+
+ public int[] getAvailableEffectModesChecked() {
+ Key<int[]> key =
+ CameraCharacteristics.CONTROL_AVAILABLE_EFFECTS;
+ int[] modes = getValueFromKeyNonNull(key);
+
+ if (modes == null) {
+ return new int[0];
+ }
+
+ List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+ // OFF must be included.
+ checkTrueForKey(key, " OFF must be included",
+ modeList.contains(CameraMetadata.CONTROL_EFFECT_MODE_OFF));
+
+ return modes;
+ }
+
+ /**
+ * Get and check the available color aberration modes
+ *
+ * @return the available color aberration modes
+ */
+ public int[] getAvailableColorAberrationModesChecked() {
+ Key<int[]> key =
+ CameraCharacteristics.COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES;
+ int[] modes = getValueFromKeyNonNull(key);
+
+ if (modes == null) {
+ return new int[0];
+ }
+
+ List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+ checkTrueForKey(key, " Camera devices must always support either OFF or FAST mode",
+ modeList.contains(CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_OFF) ||
+ modeList.contains(CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_FAST));
+
+ if (isHardwareLevelLimitedOrBetter()) {
+ // FAST and HIGH_QUALITY mode must be both present or both not present
+ List<Integer> coupledModes = Arrays.asList(new Integer[] {
+ CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_FAST,
+ CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY
+ });
+ checkTrueForKey(
+ key, " FAST and HIGH_QUALITY mode must both present or both not present",
+ containsAllOrNone(modeList, coupledModes));
+ }
+ checkElementDistinct(key, modeList);
+ checkArrayValuesInRange(key, modes,
+ CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_OFF,
+ CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY);
+
+ return modes;
+ }
+
+ /**
+ * Get max pipeline depth and do the sanity check.
+ *
+ * @return max pipeline depth, default value if it is not available.
+ */
+ public byte getPipelineMaxDepthChecked() {
+ Key<Byte> key =
+ CameraCharacteristics.REQUEST_PIPELINE_MAX_DEPTH;
+ Byte maxDepth = getValueFromKeyNonNull(key);
+
+ if (maxDepth == null) {
+ return REQUEST_PIPELINE_MAX_DEPTH_MAX;
+ }
+
+ checkTrueForKey(key, " max pipeline depth should be no larger than "
+ + REQUEST_PIPELINE_MAX_DEPTH_MAX, maxDepth <= REQUEST_PIPELINE_MAX_DEPTH_MAX);
+
+ return maxDepth;
+ }
+
+ /**
+ * Get available lens shading modes.
+ */
+ public int[] getAvailableLensShadingModesChecked() {
+ Key<int[]> key =
+ CameraCharacteristics.SHADING_AVAILABLE_MODES;
+ int[] modes = getValueFromKeyNonNull(key);
+ if (modes == null) {
+ return new int[0];
+ }
+
+ List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+ // FAST must be included.
+ checkTrueForKey(key, " FAST must be included",
+ modeList.contains(CameraMetadata.SHADING_MODE_FAST));
+
+ if (isCapabilitySupported(
+ CameraMetadata.REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING)) {
+ checkTrueForKey(key, " OFF must be included for MANUAL_POST_PROCESSING devices",
+ modeList.contains(CameraMetadata.SHADING_MODE_OFF));
+ }
+ return modes;
+ }
+
+ /**
+ * Get available lens shading map modes.
+ */
+ public int[] getAvailableLensShadingMapModesChecked() {
+ Key<int[]> key =
+ CameraCharacteristics.STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES;
+ int[] modes = getValueFromKeyNonNull(key);
+ if (modes == null) {
+ return new int[0];
+ }
+
+ List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+
+ if (isCapabilitySupported(
+ CameraMetadata.REQUEST_AVAILABLE_CAPABILITIES_RAW)) {
+ checkTrueForKey(key, " ON must be included for RAW capability devices",
+ modeList.contains(CameraMetadata.STATISTICS_LENS_SHADING_MAP_MODE_ON));
+ }
+ return modes;
+ }
+
+
+ /**
+ * Get available capabilities and do the sanity check.
+ *
+ * @return reported available capabilities list, empty list if the value is unavailable.
+ */
+ public List<Integer> getAvailableCapabilitiesChecked() {
+ Key<int[]> key =
+ CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES;
+ int[] availableCaps = getValueFromKeyNonNull(key);
+ List<Integer> capList;
+
+ if (availableCaps == null) {
+ return new ArrayList<Integer>();
+ }
+
+ checkArrayValuesInRange(key, availableCaps,
+ CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE,
+ CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO);
+ capList = Arrays.asList(CameraTestUtils.toObject(availableCaps));
+ return capList;
+ }
+
+ /**
+ * Determine whether the current device supports a capability or not.
+ *
+ * @param capability (non-negative)
+ *
+ * @return {@code true} if the capability is supported, {@code false} otherwise.
+ *
+ * @throws IllegalArgumentException if {@code capability} was negative
+ *
+ * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES
+ */
+ public boolean isCapabilitySupported(int capability) {
+ if (capability < 0) {
+ throw new IllegalArgumentException("capability must be non-negative");
+ }
+
+ List<Integer> availableCapabilities = getAvailableCapabilitiesChecked();
+
+ return availableCapabilities.contains(capability);
+ }
+
+ /**
+ * Determine whether or not all the {@code keys} are available characteristics keys
+ * (as in {@link CameraCharacteristics#getKeys}.
+ *
+ * <p>If this returns {@code true}, then querying for this key from a characteristics
+ * object will always return a non-{@code null} value.</p>
+ *
+ * @param keys collection of camera characteristics keys
+ * @return whether or not all characteristics keys are available
+ */
+ public final boolean areCharacteristicsKeysAvailable(
+ Collection<Key<?>> keys) {
+ return mCharacteristics.getKeys().containsAll(keys);
+ }
+
+ /**
+ * Determine whether or not all the {@code keys} are available result keys
+ * (as in {@link CameraCharacteristics#getAvailableCaptureResultKeys}.
+ *
+ * <p>If this returns {@code true}, then querying for this key from a result
+ * object will almost always return a non-{@code null} value.</p>
+ *
+ * <p>In some cases (e.g. lens shading map), the request must have additional settings
+ * configured in order for the key to correspond to a value.</p>
+ *
+ * @param keys collection of capture result keys
+ * @return whether or not all result keys are available
+ */
+ public final boolean areResultKeysAvailable(Collection<CaptureResult.Key<?>> keys) {
+ return mCharacteristics.getAvailableCaptureResultKeys().containsAll(keys);
+ }
+
+ /**
+ * Determine whether or not all the {@code keys} are available request keys
+ * (as in {@link CameraCharacteristics#getAvailableCaptureRequestKeys}.
+ *
+ * <p>If this returns {@code true}, then setting this key in the request builder
+ * may have some effect (and if it's {@code false}, then the camera device will
+ * definitely ignore it).</p>
+ *
+ * <p>In some cases (e.g. manual control of exposure), other keys must be also be set
+ * in order for a key to take effect (e.g. control.mode set to OFF).</p>
+ *
+ * @param keys collection of capture request keys
+ * @return whether or not all result keys are available
+ */
+ public final boolean areRequestKeysAvailable(Collection<CaptureRequest.Key<?>> keys) {
+ return mCharacteristics.getAvailableCaptureRequestKeys().containsAll(keys);
+ }
+
+ /**
+ * Determine whether or not all the {@code keys} are available characteristics keys
+ * (as in {@link CameraCharacteristics#getKeys}.
+ *
+ * <p>If this returns {@code true}, then querying for this key from a characteristics
+ * object will always return a non-{@code null} value.</p>
+ *
+ * @param keys one or more camera characteristic keys
+ * @return whether or not all characteristics keys are available
+ */
+ @SafeVarargs
+ public final boolean areKeysAvailable(Key<?>... keys) {
+ return areCharacteristicsKeysAvailable(Arrays.asList(keys));
+ }
+
+ /**
+ * Determine whether or not all the {@code keys} are available result keys
+ * (as in {@link CameraCharacteristics#getAvailableCaptureResultKeys}.
+ *
+ * <p>If this returns {@code true}, then querying for this key from a result
+ * object will almost always return a non-{@code null} value.</p>
+ *
+ * <p>In some cases (e.g. lens shading map), the request must have additional settings
+ * configured in order for the key to correspond to a value.</p>
+ *
+ * @param keys one or more capture result keys
+ * @return whether or not all result keys are available
+ */
+ @SafeVarargs
+ public final boolean areKeysAvailable(CaptureResult.Key<?>... keys) {
+ return areResultKeysAvailable(Arrays.asList(keys));
+ }
+
+ /**
+ * Determine whether or not all the {@code keys} are available request keys
+ * (as in {@link CameraCharacteristics#getAvailableCaptureRequestKeys}.
+ *
+ * <p>If this returns {@code true}, then setting this key in the request builder
+ * may have some effect (and if it's {@code false}, then the camera device will
+ * definitely ignore it).</p>
+ *
+ * <p>In some cases (e.g. manual control of exposure), other keys must be also be set
+ * in order for a key to take effect (e.g. control.mode set to OFF).</p>
+ *
+ * @param keys one or more capture request keys
+ * @return whether or not all result keys are available
+ */
+ @SafeVarargs
+ public final boolean areKeysAvailable(CaptureRequest.Key<?>... keys) {
+ return areRequestKeysAvailable(Arrays.asList(keys));
+ }
+
+ /*
+ * Determine if camera device support AE lock control
+ *
+ * @return {@code true} if AE lock control is supported
+ */
+ public boolean isAeLockSupported() {
+ return getValueFromKeyNonNull(CameraCharacteristics.CONTROL_AE_LOCK_AVAILABLE);
+ }
+
+ /*
+ * Determine if camera device support AWB lock control
+ *
+ * @return {@code true} if AWB lock control is supported
+ */
+ public boolean isAwbLockSupported() {
+ return getValueFromKeyNonNull(CameraCharacteristics.CONTROL_AWB_LOCK_AVAILABLE);
+ }
+
+
+ /*
+ * Determine if camera device support manual lens shading map control
+ *
+ * @return {@code true} if manual lens shading map control is supported
+ */
+ public boolean isManualLensShadingMapSupported() {
+ return areKeysAvailable(CaptureRequest.SHADING_MODE);
+ }
+
+ /**
+ * Determine if camera device support manual color correction control
+ *
+ * @return {@code true} if manual color correction control is supported
+ */
+ public boolean isColorCorrectionSupported() {
+ return areKeysAvailable(CaptureRequest.COLOR_CORRECTION_MODE);
+ }
+
+ /**
+ * Determine if camera device support manual tone mapping control
+ *
+ * @return {@code true} if manual tone mapping control is supported
+ */
+ public boolean isManualToneMapSupported() {
+ return areKeysAvailable(CaptureRequest.TONEMAP_MODE);
+ }
+
+ /**
+ * Determine if camera device support manual color aberration control
+ *
+ * @return {@code true} if manual color aberration control is supported
+ */
+ public boolean isManualColorAberrationControlSupported() {
+ return areKeysAvailable(CaptureRequest.COLOR_CORRECTION_ABERRATION_MODE);
+ }
+
+ /**
+ * Determine if camera device support edge mode control
+ *
+ * @return {@code true} if edge mode control is supported
+ */
+ public boolean isEdgeModeControlSupported() {
+ return areKeysAvailable(CaptureRequest.EDGE_MODE);
+ }
+
+ /**
+ * Determine if camera device support hot pixel mode control
+ *
+ * @return {@code true} if hot pixel mode control is supported
+ */
+ public boolean isHotPixelMapModeControlSupported() {
+ return areKeysAvailable(CaptureRequest.HOT_PIXEL_MODE);
+ }
+
+ /**
+ * Determine if camera device support noise reduction mode control
+ *
+ * @return {@code true} if noise reduction mode control is supported
+ */
+ public boolean isNoiseReductionModeControlSupported() {
+ return areKeysAvailable(CaptureRequest.NOISE_REDUCTION_MODE);
+ }
+
+ /**
+ * Get max number of output raw streams and do the basic sanity check.
+ *
+ * @return reported max number of raw output stream
+ */
+ public int getMaxNumOutputStreamsRawChecked() {
+ Integer maxNumStreams =
+ getValueFromKeyNonNull(CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_RAW);
+ if (maxNumStreams == null)
+ return 0;
+ return maxNumStreams;
+ }
+
+ /**
+ * Get max number of output processed streams and do the basic sanity check.
+ *
+ * @return reported max number of processed output stream
+ */
+ public int getMaxNumOutputStreamsProcessedChecked() {
+ Integer maxNumStreams =
+ getValueFromKeyNonNull(CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_PROC);
+ if (maxNumStreams == null)
+ return 0;
+ return maxNumStreams;
+ }
+
+ /**
+ * Get max number of output stalling processed streams and do the basic sanity check.
+ *
+ * @return reported max number of stalling processed output stream
+ */
+ public int getMaxNumOutputStreamsProcessedStallChecked() {
+ Integer maxNumStreams =
+ getValueFromKeyNonNull(CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_PROC_STALLING);
+ if (maxNumStreams == null)
+ return 0;
+ return maxNumStreams;
+ }
+
+ /**
+ * Get lens facing and do the sanity check
+ * @return lens facing, return default value (BACK) if value is unavailable.
+ */
+ public int getLensFacingChecked() {
+ Key<Integer> key =
+ CameraCharacteristics.LENS_FACING;
+ Integer facing = getValueFromKeyNonNull(key);
+
+ if (facing == null) {
+ return CameraCharacteristics.LENS_FACING_BACK;
+ }
+
+ checkTrueForKey(key, " value is out of range ",
+ facing >= CameraCharacteristics.LENS_FACING_FRONT &&
+ facing <= CameraCharacteristics.LENS_FACING_BACK);
+ return facing;
+ }
+
+ /**
+ * Get maxCaptureStall frames or default value (if value doesn't exist)
+ * @return maxCaptureStall frames or default value.
+ */
+ public int getMaxCaptureStallOrDefault() {
+ Key<Integer> key =
+ CameraCharacteristics.REPROCESS_MAX_CAPTURE_STALL;
+ Integer value = getValueFromKeyNonNull(key);
+
+ if (value == null) {
+ return MAX_REPROCESS_MAX_CAPTURE_STALL;
+ }
+
+ checkTrueForKey(key, " value is out of range ",
+ value >= 0 &&
+ value <= MAX_REPROCESS_MAX_CAPTURE_STALL);
+
+ return value;
+ }
+
+ /**
+ * Get the scaler's cropping type (center only or freeform)
+ * @return cropping type, return default value (CENTER_ONLY) if value is unavailable
+ */
+ public int getScalerCroppingTypeChecked() {
+ Key<Integer> key =
+ CameraCharacteristics.SCALER_CROPPING_TYPE;
+ Integer value = getValueFromKeyNonNull(key);
+
+ if (value == null) {
+ return CameraCharacteristics.SCALER_CROPPING_TYPE_CENTER_ONLY;
+ }
+
+ checkTrueForKey(key, " value is out of range ",
+ value >= CameraCharacteristics.SCALER_CROPPING_TYPE_CENTER_ONLY &&
+ value <= CameraCharacteristics.SCALER_CROPPING_TYPE_FREEFORM);
+
+ return value;
+ }
+
+ /**
+ * Check if the constrained high speed video is supported by the camera device.
+ * The high speed FPS ranges and sizes are sanitized in
+ * ExtendedCameraCharacteristicsTest#testConstrainedHighSpeedCapability.
+ *
+ * @return true if the constrained high speed video is supported, false otherwise.
+ */
+ public boolean isConstrainedHighSpeedVideoSupported() {
+ List<Integer> availableCapabilities = getAvailableCapabilitiesChecked();
+ return (availableCapabilities.contains(
+ CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO));
+ }
+
+ /**
+ * Check if high speed video is supported (HIGH_SPEED_VIDEO scene mode is
+ * supported, supported high speed fps ranges and sizes are valid).
+ *
+ * @return true if high speed video is supported.
+ */
+ public boolean isHighSpeedVideoSupported() {
+ List<Integer> sceneModes =
+ Arrays.asList(CameraTestUtils.toObject(getAvailableSceneModesChecked()));
+ if (sceneModes.contains(CameraCharacteristics.CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO)) {
+ StreamConfigurationMap config =
+ getValueFromKeyNonNull(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+ if (config == null) {
+ return false;
+ }
+ Size[] availableSizes = config.getHighSpeedVideoSizes();
+ if (availableSizes.length == 0) {
+ return false;
+ }
+
+ for (Size size : availableSizes) {
+ Range<Integer>[] availableFpsRanges = config.getHighSpeedVideoFpsRangesFor(size);
+ if (availableFpsRanges.length == 0) {
+ return false;
+ }
+ }
+
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Check if depth output is supported, based on the depth capability
+ */
+ public boolean isDepthOutputSupported() {
+ return isCapabilitySupported(
+ CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT);
+ }
+
+ /**
+ * Check if standard outputs (PRIVATE, YUV, JPEG) outputs are supported, based on the
+ * backwards-compatible capability
+ */
+ public boolean isColorOutputSupported() {
+ return isCapabilitySupported(
+ CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE);
+ }
+
+ /**
+ * Check if optical black regions key is supported.
+ */
+ public boolean isOpticalBlackRegionSupported() {
+ return areKeysAvailable(CameraCharacteristics.SENSOR_OPTICAL_BLACK_REGIONS);
+ }
+
+ /**
+ * Check if the dynamic black level is supported.
+ *
+ * <p>
+ * Note that: This also indicates if the white level is supported, as dynamic black and white
+ * level must be all supported or none of them is supported.
+ * </p>
+ */
+ public boolean isDynamicBlackLevelSupported() {
+ return areKeysAvailable(CaptureResult.SENSOR_DYNAMIC_BLACK_LEVEL);
+ }
+
+ /**
+ * Get the value in index for a fixed-size array from a given key.
+ *
+ * <p>If the camera device is incorrectly reporting values, log a warning and return
+ * the default value instead.</p>
+ *
+ * @param key Key to fetch
+ * @param defaultValue Default value to return if camera device uses invalid values
+ * @param name Human-readable name for the array index (logging only)
+ * @param index Array index of the subelement
+ * @param size Expected fixed size of the array
+ *
+ * @return The value reported by the camera device, or the defaultValue otherwise.
+ */
+ private <T> T getArrayElementOrDefault(Key<?> key, T defaultValue, String name, int index,
+ int size) {
+ T elementValue = getArrayElementCheckRangeNonNull(
+ key,
+ index,
+ size);
+
+ if (elementValue == null) {
+ failKeyCheck(key,
+ "had no valid " + name + " value; using default of " + defaultValue);
+ elementValue = defaultValue;
+ }
+
+ return elementValue;
+ }
+
+ /**
+ * Fetch an array sub-element from an array value given by a key.
+ *
+ * <p>
+ * Prints a warning if the sub-element was null.
+ * </p>
+ *
+ * <p>Use for variable-size arrays since this does not check the array size.</p>
+ *
+ * @param key Metadata key to look up
+ * @param element A non-negative index value.
+ * @return The array sub-element, or null if the checking failed.
+ */
+ private <T> T getArrayElementNonNull(Key<?> key, int element) {
+ return getArrayElementCheckRangeNonNull(key, element, IGNORE_SIZE_CHECK);
+ }
+
+ /**
+ * Fetch an array sub-element from an array value given by a key.
+ *
+ * <p>
+ * Prints a warning if the array size does not match the size, or if the sub-element was null.
+ * </p>
+ *
+ * @param key Metadata key to look up
+ * @param element The index in [0,size)
+ * @param size A positive size value or otherwise {@value #IGNORE_SIZE_CHECK}
+ * @return The array sub-element, or null if the checking failed.
+ */
+ private <T> T getArrayElementCheckRangeNonNull(Key<?> key, int element, int size) {
+ Object array = getValueFromKeyNonNull(key);
+
+ if (array == null) {
+ // Warning already printed
+ return null;
+ }
+
+ if (size != IGNORE_SIZE_CHECK) {
+ int actualLength = Array.getLength(array);
+ if (actualLength != size) {
+ failKeyCheck(key,
+ String.format("had the wrong number of elements (%d), expected (%d)",
+ actualLength, size));
+ return null;
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ T val = (T) Array.get(array, element);
+
+ if (val == null) {
+ failKeyCheck(key, "had a null element at index" + element);
+ return null;
+ }
+
+ return val;
+ }
+
+ /**
+ * Gets the key, logging warnings for null values.
+ */
+ public <T> T getValueFromKeyNonNull(Key<T> key) {
+ if (key == null) {
+ throw new IllegalArgumentException("key was null");
+ }
+
+ T value = mCharacteristics.get(key);
+
+ if (value == null) {
+ failKeyCheck(key, "was null");
+ }
+
+ return value;
+ }
+
+ private void checkArrayValuesInRange(Key<int[]> key, int[] array, int min, int max) {
+ for (int value : array) {
+ checkTrueForKey(key, String.format(" value is out of range [%d, %d]", min, max),
+ value <= max && value >= min);
+ }
+ }
+
+ private void checkArrayValuesInRange(Key<byte[]> key, byte[] array, byte min, byte max) {
+ for (byte value : array) {
+ checkTrueForKey(key, String.format(" value is out of range [%d, %d]", min, max),
+ value <= max && value >= min);
+ }
+ }
+
+ /**
+ * Check the uniqueness of the values in a list.
+ *
+ * @param key The key to be checked
+ * @param list The list contains the value of the key
+ */
+ private <U, T> void checkElementDistinct(Key<U> key, List<T> list) {
+ // Each size must be distinct.
+ Set<T> sizeSet = new HashSet<T>(list);
+ checkTrueForKey(key, "Each size must be distinct", sizeSet.size() == list.size());
+ }
+
+ private <T> void checkTrueForKey(Key<T> key, String message, boolean condition) {
+ if (!condition) {
+ failKeyCheck(key, message);
+ }
+ }
+
+ /* Helper function to check if the coupled modes are either all present or all non-present */
+ private <T> boolean containsAllOrNone(Collection<T> observedModes, Collection<T> coupledModes) {
+ if (observedModes.containsAll(coupledModes)) {
+ return true;
+ }
+ for (T mode : coupledModes) {
+ if (observedModes.contains(mode)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private <T> void failKeyCheck(Key<T> key, String message) {
+ // TODO: Consider only warning once per key/message combination if it's too spammy.
+ // TODO: Consider offering other options such as throwing an assertion exception
+ String failureCause = String.format("The static info key '%s' %s", key.getName(), message);
+ switch (mLevel) {
+ case WARN:
+ Log.w(TAG, failureCause);
+ break;
+ case COLLECT:
+ mCollector.addMessage(failureCause);
+ break;
+ case ASSERT:
+ Assert.fail(failureCause);
+ default:
+ throw new UnsupportedOperationException("Unhandled level " + mLevel);
+ }
+ }
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2CaptureRequestTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2CaptureRequestTest.java
new file mode 100644
index 0000000..b152975
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2CaptureRequestTest.java
@@ -0,0 +1,441 @@
+/*
+ * Copyright 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mediaframeworktest.stress;
+
+import com.android.mediaframeworktest.Camera2SurfaceViewTestCase;
+import com.android.mediaframeworktest.helpers.CameraTestUtils.SimpleCaptureCallback;
+
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.util.Log;
+import android.util.Rational;
+import android.util.Size;
+
+import java.util.Arrays;
+
+import static android.hardware.camera2.CameraCharacteristics.CONTROL_AE_MODE_OFF;
+import static android.hardware.camera2.CameraCharacteristics.CONTROL_AE_MODE_ON;
+import static android.hardware.camera2.CameraCharacteristics.CONTROL_AE_MODE_ON_ALWAYS_FLASH;
+import static android.hardware.camera2.CameraCharacteristics.CONTROL_AE_MODE_ON_AUTO_FLASH;
+import static android.hardware.camera2.CameraCharacteristics.CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.getValueNotNull;
+
+/**
+ * <p>
+ * Basic test for camera CaptureRequest key controls.
+ * </p>
+ * <p>
+ * Several test categories are covered: manual sensor control, 3A control,
+ * manual ISP control and other per-frame control and synchronization.
+ * </p>
+ *
+ * adb shell am instrument \
+ * -e class com.android.mediaframeworktest.stress.Camera2CaptureRequestTest#testAeModeAndLock \
+ * -e repeat 10 \
+ * -e waitIntervalMs 1000 \
+ * -e resultToFile false \
+ * -r -w com.android.mediaframeworktest/.Camera2InstrumentationTestRunner
+ */
+public class Camera2CaptureRequestTest extends Camera2SurfaceViewTestCase {
+ private static final String TAG = "CaptureRequestTest";
+ private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
+ /** 30ms exposure time must be supported by full capability devices. */
+ private static final long DEFAULT_EXP_TIME_NS = 30000000L;
+ private static final int DEFAULT_SENSITIVITY = 100;
+ private static final long EXPOSURE_TIME_ERROR_MARGIN_NS = 100000L; // 100us, Approximation.
+ private static final float EXPOSURE_TIME_ERROR_MARGIN_RATE = 0.03f; // 3%, Approximation.
+ private static final float SENSITIVITY_ERROR_MARGIN_RATE = 0.03f; // 3%, Approximation.
+ private static final int DEFAULT_NUM_EXPOSURE_TIME_STEPS = 3;
+ private static final int DEFAULT_NUM_SENSITIVITY_STEPS = 16;
+ private static final int DEFAULT_SENSITIVITY_STEP_SIZE = 100;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ /**
+ * Test AE mode and lock.
+ *
+ * <p>
+ * For AE lock, when it is locked, exposure parameters shouldn't be changed.
+ * For AE modes, each mode should satisfy the per frame controls defined in
+ * API specifications.
+ * </p>
+ */
+ public void testAeModeAndLock() throws Exception {
+ for (int i = 0; i < mCameraIds.length; i++) {
+ try {
+ openDevice(mCameraIds[i]);
+ if (!mStaticInfo.isColorOutputSupported()) {
+ Log.i(TAG, "Camera " + mCameraIds[i] +
+ " does not support color outputs, skipping");
+ continue;
+ }
+
+ Size maxPreviewSz = mOrderedPreviewSizes.get(0); // Max preview size.
+
+ // Update preview surface with given size for all sub-tests.
+ updatePreviewSurface(maxPreviewSz);
+
+ // Test iteration starts...
+ for (int repeat = 0; repeat < getRepeatCount(); ++repeat) {
+ Log.v(TAG, String.format("AE mode and lock: %d/%d", repeat + 1,
+ getRepeatCount()));
+
+ // Test aeMode and lock
+ int[] aeModes = mStaticInfo.getAeAvailableModesChecked();
+ for (int mode : aeModes) {
+ aeModeAndLockTestByMode(mode);
+ }
+ getResultPrinter().printStatus(getRepeatCount(), repeat + 1, mCameraIds[i]);
+ Thread.sleep(getTestWaitIntervalMs());
+ }
+ } finally {
+ closeDevice();
+ }
+ }
+ }
+
+ /**
+ * Test the all available AE modes and AE lock.
+ * <p>
+ * For manual AE mode, test iterates through different sensitivities and
+ * exposure times, validate the result exposure time correctness. For
+ * CONTROL_AE_MODE_ON_ALWAYS_FLASH mode, the AE lock and flash are tested.
+ * For the rest of the AUTO mode, AE lock is tested.
+ * </p>
+ *
+ * @param mode
+ */
+ private void aeModeAndLockTestByMode(int mode)
+ throws Exception {
+ switch (mode) {
+ case CONTROL_AE_MODE_OFF:
+ if (mStaticInfo.isCapabilitySupported(
+ CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR)) {
+ // Test manual exposure control.
+ aeManualControlTest();
+ } else {
+ Log.w(TAG,
+ "aeModeAndLockTestByMode - can't test AE mode OFF without " +
+ "manual sensor control");
+ }
+ break;
+ case CONTROL_AE_MODE_ON:
+ case CONTROL_AE_MODE_ON_AUTO_FLASH:
+ case CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE:
+ case CONTROL_AE_MODE_ON_ALWAYS_FLASH:
+ // Test AE lock for above AUTO modes.
+ aeAutoModeTestLock(mode);
+ break;
+ default:
+ throw new UnsupportedOperationException("Unhandled AE mode " + mode);
+ }
+ }
+
+ /**
+ * Test AE auto modes.
+ * <p>
+ * Use single request rather than repeating request to test AE lock per frame control.
+ * </p>
+ */
+ private void aeAutoModeTestLock(int mode) throws Exception {
+ CaptureRequest.Builder requestBuilder =
+ mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+ if (mStaticInfo.isAeLockSupported()) {
+ requestBuilder.set(CaptureRequest.CONTROL_AE_LOCK, false);
+ }
+ requestBuilder.set(CaptureRequest.CONTROL_AE_MODE, mode);
+ configurePreviewOutput(requestBuilder);
+
+ final int MAX_NUM_CAPTURES_DURING_LOCK = 5;
+ for (int i = 1; i <= MAX_NUM_CAPTURES_DURING_LOCK; i++) {
+ autoAeMultipleCapturesThenTestLock(requestBuilder, mode, i);
+ }
+ }
+
+ /**
+ * Issue multiple auto AE captures, then lock AE, validate the AE lock vs.
+ * the first capture result after the AE lock. The right AE lock behavior is:
+ * When it is locked, it locks to the current exposure value, and all subsequent
+ * request with lock ON will have the same exposure value locked.
+ */
+ private void autoAeMultipleCapturesThenTestLock(
+ CaptureRequest.Builder requestBuilder, int aeMode, int numCapturesDuringLock)
+ throws Exception {
+ if (numCapturesDuringLock < 1) {
+ throw new IllegalArgumentException("numCapturesBeforeLock must be no less than 1");
+ }
+ if (VERBOSE) {
+ Log.v(TAG, "Camera " + mCamera.getId() + ": Testing auto AE mode and lock for mode "
+ + aeMode + " with " + numCapturesDuringLock + " captures before lock");
+ }
+
+ final int NUM_CAPTURES_BEFORE_LOCK = 2;
+ SimpleCaptureCallback listener = new SimpleCaptureCallback();
+
+ CaptureResult[] resultsDuringLock = new CaptureResult[numCapturesDuringLock];
+ boolean canSetAeLock = mStaticInfo.isAeLockSupported();
+
+ // Reset the AE lock to OFF, since we are reusing this builder many times
+ if (canSetAeLock) {
+ requestBuilder.set(CaptureRequest.CONTROL_AE_LOCK, false);
+ }
+
+ // Just send several captures with auto AE, lock off.
+ CaptureRequest request = requestBuilder.build();
+ for (int i = 0; i < NUM_CAPTURES_BEFORE_LOCK; i++) {
+ mSession.capture(request, listener, mHandler);
+ }
+ waitForNumResults(listener, NUM_CAPTURES_BEFORE_LOCK);
+
+ if (!canSetAeLock) {
+ // Without AE lock, the remaining tests items won't work
+ return;
+ }
+
+ // Then fire several capture to lock the AE.
+ requestBuilder.set(CaptureRequest.CONTROL_AE_LOCK, true);
+
+ int requestCount = captureRequestsSynchronized(
+ requestBuilder.build(), numCapturesDuringLock, listener, mHandler);
+
+ int[] sensitivities = new int[numCapturesDuringLock];
+ long[] expTimes = new long[numCapturesDuringLock];
+ Arrays.fill(sensitivities, -1);
+ Arrays.fill(expTimes, -1L);
+
+ // Get the AE lock on result and validate the exposure values.
+ waitForNumResults(listener, requestCount - numCapturesDuringLock);
+ for (int i = 0; i < resultsDuringLock.length; i++) {
+ resultsDuringLock[i] = listener.getCaptureResult(WAIT_FOR_RESULT_TIMEOUT_MS);
+ }
+
+ for (int i = 0; i < numCapturesDuringLock; i++) {
+ mCollector.expectKeyValueEquals(
+ resultsDuringLock[i], CaptureResult.CONTROL_AE_LOCK, true);
+ }
+
+ // Can't read manual sensor/exposure settings without manual sensor
+ if (mStaticInfo.isCapabilitySupported(
+ CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS)) {
+ int sensitivityLocked =
+ getValueNotNull(resultsDuringLock[0], CaptureResult.SENSOR_SENSITIVITY);
+ long expTimeLocked =
+ getValueNotNull(resultsDuringLock[0], CaptureResult.SENSOR_EXPOSURE_TIME);
+ for (int i = 1; i < resultsDuringLock.length; i++) {
+ mCollector.expectKeyValueEquals(
+ resultsDuringLock[i], CaptureResult.SENSOR_EXPOSURE_TIME, expTimeLocked);
+ mCollector.expectKeyValueEquals(
+ resultsDuringLock[i], CaptureResult.SENSOR_SENSITIVITY, sensitivityLocked);
+ }
+ }
+ }
+
+ /**
+ * Iterate through exposure times and sensitivities for manual AE control.
+ * <p>
+ * Use single request rather than repeating request to test manual exposure
+ * value change per frame control.
+ * </p>
+ */
+ private void aeManualControlTest()
+ throws Exception {
+ CaptureRequest.Builder requestBuilder =
+ mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+
+ requestBuilder.set(CaptureRequest.CONTROL_AE_MODE, CONTROL_AE_MODE_OFF);
+ configurePreviewOutput(requestBuilder);
+ SimpleCaptureCallback listener = new SimpleCaptureCallback();
+
+ long[] expTimes = getExposureTimeTestValues();
+ int[] sensitivities = getSensitivityTestValues();
+ // Submit single request at a time, then verify the result.
+ for (int i = 0; i < expTimes.length; i++) {
+ for (int j = 0; j < sensitivities.length; j++) {
+ if (VERBOSE) {
+ Log.v(TAG, "Camera " + mCamera.getId() + ": Testing sensitivity "
+ + sensitivities[j] + ", exposure time " + expTimes[i] + "ns");
+ }
+
+ changeExposure(requestBuilder, expTimes[i], sensitivities[j]);
+ mSession.capture(requestBuilder.build(), listener, mHandler);
+
+ // make sure timeout is long enough for long exposure time
+ long timeout = WAIT_FOR_RESULT_TIMEOUT_MS + expTimes[i];
+ CaptureResult result = listener.getCaptureResult(timeout);
+ long resultExpTime = getValueNotNull(result, CaptureResult.SENSOR_EXPOSURE_TIME);
+ int resultSensitivity = getValueNotNull(result, CaptureResult.SENSOR_SENSITIVITY);
+ validateExposureTime(expTimes[i], resultExpTime);
+ validateSensitivity(sensitivities[j], resultSensitivity);
+ validateFrameDurationForCapture(result);
+ }
+ }
+ // TODO: Add another case to test where we can submit all requests, then wait for
+ // results, which will hide the pipeline latency. this is not only faster, but also
+ // test high speed per frame control and synchronization.
+ }
+
+ //----------------------------------------------------------------
+ //---------Below are common functions for all tests.--------------
+ //----------------------------------------------------------------
+
+ /**
+ * Enable exposure manual control and change exposure and sensitivity and
+ * clamp the value into the supported range.
+ */
+ private void changeExposure(CaptureRequest.Builder requestBuilder,
+ long expTime, int sensitivity) {
+ // Check if the max analog sensitivity is available and no larger than max sensitivity.
+ // The max analog sensitivity is not actually used here. This is only an extra sanity check.
+ mStaticInfo.getMaxAnalogSensitivityChecked();
+
+ expTime = mStaticInfo.getExposureClampToRange(expTime);
+ sensitivity = mStaticInfo.getSensitivityClampToRange(sensitivity);
+
+ requestBuilder.set(CaptureRequest.CONTROL_AE_MODE, CONTROL_AE_MODE_OFF);
+ requestBuilder.set(CaptureRequest.SENSOR_EXPOSURE_TIME, expTime);
+ requestBuilder.set(CaptureRequest.SENSOR_SENSITIVITY, sensitivity);
+ }
+
+ /**
+ * Get the exposure time array that contains multiple exposure time steps in
+ * the exposure time range.
+ */
+ private long[] getExposureTimeTestValues() {
+ long[] testValues = new long[DEFAULT_NUM_EXPOSURE_TIME_STEPS + 1];
+ long maxExpTime = mStaticInfo.getExposureMaximumOrDefault(DEFAULT_EXP_TIME_NS);
+ long minExpTime = mStaticInfo.getExposureMinimumOrDefault(DEFAULT_EXP_TIME_NS);
+
+ long range = maxExpTime - minExpTime;
+ double stepSize = range / (double)DEFAULT_NUM_EXPOSURE_TIME_STEPS;
+ for (int i = 0; i < testValues.length; i++) {
+ testValues[i] = maxExpTime - (long)(stepSize * i);
+ testValues[i] = mStaticInfo.getExposureClampToRange(testValues[i]);
+ }
+
+ return testValues;
+ }
+
+ /**
+ * Get the sensitivity array that contains multiple sensitivity steps in the
+ * sensitivity range.
+ * <p>
+ * Sensitivity number of test values is determined by
+ * {@value #DEFAULT_SENSITIVITY_STEP_SIZE} and sensitivity range, and
+ * bounded by {@value #DEFAULT_NUM_SENSITIVITY_STEPS}.
+ * </p>
+ */
+ private int[] getSensitivityTestValues() {
+ int maxSensitivity = mStaticInfo.getSensitivityMaximumOrDefault(
+ DEFAULT_SENSITIVITY);
+ int minSensitivity = mStaticInfo.getSensitivityMinimumOrDefault(
+ DEFAULT_SENSITIVITY);
+
+ int range = maxSensitivity - minSensitivity;
+ int stepSize = DEFAULT_SENSITIVITY_STEP_SIZE;
+ int numSteps = range / stepSize;
+ // Bound the test steps to avoid supper long test.
+ if (numSteps > DEFAULT_NUM_SENSITIVITY_STEPS) {
+ numSteps = DEFAULT_NUM_SENSITIVITY_STEPS;
+ stepSize = range / numSteps;
+ }
+ int[] testValues = new int[numSteps + 1];
+ for (int i = 0; i < testValues.length; i++) {
+ testValues[i] = maxSensitivity - stepSize * i;
+ testValues[i] = mStaticInfo.getSensitivityClampToRange(testValues[i]);
+ }
+
+ return testValues;
+ }
+
+ /**
+ * Validate the AE manual control exposure time.
+ *
+ * <p>Exposure should be close enough, and only round down if they are not equal.</p>
+ *
+ * @param request Request exposure time
+ * @param result Result exposure time
+ */
+ private void validateExposureTime(long request, long result) {
+ long expTimeDelta = request - result;
+ long expTimeErrorMargin = (long)(Math.max(EXPOSURE_TIME_ERROR_MARGIN_NS, request
+ * EXPOSURE_TIME_ERROR_MARGIN_RATE));
+ // First, round down not up, second, need close enough.
+ mCollector.expectTrue("Exposture time is invalid for AE manaul control test, request: "
+ + request + " result: " + result,
+ expTimeDelta < expTimeErrorMargin && expTimeDelta >= 0);
+ }
+
+ /**
+ * Validate AE manual control sensitivity.
+ *
+ * @param request Request sensitivity
+ * @param result Result sensitivity
+ */
+ private void validateSensitivity(int request, int result) {
+ float sensitivityDelta = request - result;
+ float sensitivityErrorMargin = request * SENSITIVITY_ERROR_MARGIN_RATE;
+ // First, round down not up, second, need close enough.
+ mCollector.expectTrue("Sensitivity is invalid for AE manaul control test, request: "
+ + request + " result: " + result,
+ sensitivityDelta < sensitivityErrorMargin && sensitivityDelta >= 0);
+ }
+
+ /**
+ * Validate frame duration for a given capture.
+ *
+ * <p>Frame duration should be longer than exposure time.</p>
+ *
+ * @param result The capture result for a given capture
+ */
+ private void validateFrameDurationForCapture(CaptureResult result) {
+ long expTime = getValueNotNull(result, CaptureResult.SENSOR_EXPOSURE_TIME);
+ long frameDuration = getValueNotNull(result, CaptureResult.SENSOR_FRAME_DURATION);
+ if (VERBOSE) {
+ Log.v(TAG, "frame duration: " + frameDuration + " Exposure time: " + expTime);
+ }
+
+ mCollector.expectTrue(String.format("Frame duration (%d) should be longer than exposure"
+ + " time (%d) for a given capture", frameDuration, expTime),
+ frameDuration >= expTime);
+
+ validatePipelineDepth(result);
+ }
+
+ /**
+ * Validate the pipeline depth result.
+ *
+ * @param result The capture result to get pipeline depth data
+ */
+ private void validatePipelineDepth(CaptureResult result) {
+ final byte MIN_PIPELINE_DEPTH = 1;
+ byte maxPipelineDepth = mStaticInfo.getPipelineMaxDepthChecked();
+ Byte pipelineDepth = getValueNotNull(result, CaptureResult.REQUEST_PIPELINE_DEPTH);
+ mCollector.expectInRange(String.format("Pipeline depth must be in the range of [%d, %d]",
+ MIN_PIPELINE_DEPTH, maxPipelineDepth), pipelineDepth, MIN_PIPELINE_DEPTH,
+ maxPipelineDepth);
+ }
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2RecordingTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2RecordingTest.java
new file mode 100644
index 0000000..e7c91cf
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2RecordingTest.java
@@ -0,0 +1,1082 @@
+/*
+ * Copyright 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mediaframeworktest.stress;
+
+import com.android.ex.camera2.blocking.BlockingSessionCallback;
+import com.android.mediaframeworktest.Camera2SurfaceViewTestCase;
+import com.android.mediaframeworktest.helpers.CameraTestUtils;
+
+import junit.framework.AssertionFailedError;
+
+import android.graphics.ImageFormat;
+import android.hardware.camera2.CameraCaptureSession;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraConstrainedHighSpeedCaptureSession;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.hardware.camera2.params.StreamConfigurationMap;
+import android.media.CamcorderProfile;
+import android.media.Image;
+import android.media.ImageReader;
+import android.media.MediaExtractor;
+import android.media.MediaFormat;
+import android.media.MediaRecorder;
+import android.os.Environment;
+import android.os.SystemClock;
+import android.test.suitebuilder.annotation.LargeTest;
+import android.util.Log;
+import android.util.Range;
+import android.util.Size;
+import android.view.Surface;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+import static com.android.ex.camera2.blocking.BlockingSessionCallback.SESSION_CLOSED;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.CAPTURE_IMAGE_TIMEOUT_MS;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.SESSION_CLOSE_TIMEOUT_MS;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.SIZE_BOUND_1080P;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.SIZE_BOUND_2160P;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.SimpleCaptureCallback;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.SimpleImageReaderListener;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.configureCameraSession;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.getSupportedVideoSizes;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.getValueNotNull;
+
+/**
+ * CameraDevice video recording use case tests by using MediaRecorder and
+ * MediaCodec.
+ *
+ * adb shell am instrument \
+ * -e class com.android.mediaframeworktest.stress.Camera2RecordingTest#testBasicRecording \
+ * -e repeat 10 \
+ * -e waitIntervalMs 1000 \
+ * -e resultToFile false \
+ * -r -w com.android.mediaframeworktest/.Camera2InstrumentationTestRunner
+ */
+@LargeTest
+public class Camera2RecordingTest extends Camera2SurfaceViewTestCase {
+ private static final String TAG = "RecordingTest";
+ private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
+ private static final boolean DEBUG_DUMP = Log.isLoggable(TAG, Log.DEBUG);
+ private static final int RECORDING_DURATION_MS = 3000;
+ private static final float DURATION_MARGIN = 0.2f;
+ private static final double FRAME_DURATION_ERROR_TOLERANCE_MS = 3.0;
+ private static final int BIT_RATE_1080P = 16000000;
+ private static final int BIT_RATE_MIN = 64000;
+ private static final int BIT_RATE_MAX = 40000000;
+ private static final int VIDEO_FRAME_RATE = 30;
+ private final String VIDEO_FILE_PATH = Environment.getExternalStorageDirectory().getPath();
+ private static final int[] mCamcorderProfileList = {
+ CamcorderProfile.QUALITY_HIGH,
+ CamcorderProfile.QUALITY_2160P,
+ CamcorderProfile.QUALITY_1080P,
+ CamcorderProfile.QUALITY_720P,
+ CamcorderProfile.QUALITY_480P,
+ CamcorderProfile.QUALITY_CIF,
+ CamcorderProfile.QUALITY_QCIF,
+ CamcorderProfile.QUALITY_QVGA,
+ CamcorderProfile.QUALITY_LOW,
+ };
+ private static final int MAX_VIDEO_SNAPSHOT_IMAGES = 5;
+ private static final int BURST_VIDEO_SNAPSHOT_NUM = 3;
+ private static final int SLOWMO_SLOW_FACTOR = 4;
+ private static final int MAX_NUM_FRAME_DROP_INTERVAL_ALLOWED = 4;
+ private List<Size> mSupportedVideoSizes;
+ private Surface mRecordingSurface;
+ private Surface mPersistentSurface;
+ private MediaRecorder mMediaRecorder;
+ private String mOutMediaFileName;
+ private int mVideoFrameRate;
+ private Size mVideoSize;
+ private long mRecordingStartTime;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ private void doBasicRecording(boolean useVideoStab) throws Exception {
+ for (int i = 0; i < mCameraIds.length; i++) {
+ try {
+ Log.i(TAG, "Testing basic recording for camera " + mCameraIds[i]);
+ // Re-use the MediaRecorder object for the same camera device.
+ mMediaRecorder = new MediaRecorder();
+ openDevice(mCameraIds[i]);
+ if (!mStaticInfo.isColorOutputSupported()) {
+ Log.i(TAG, "Camera " + mCameraIds[i] +
+ " does not support color outputs, skipping");
+ continue;
+ }
+
+ if (!mStaticInfo.isVideoStabilizationSupported() && useVideoStab) {
+ Log.i(TAG, "Camera " + mCameraIds[i] +
+ " does not support video stabilization, skipping the stabilization"
+ + " test");
+ continue;
+ }
+
+ initSupportedVideoSize(mCameraIds[i]);
+
+ // Test iteration starts...
+ for (int repeat = 0; repeat < getRepeatCount(); ++repeat) {
+ Log.v(TAG, String.format("Recording video: %d/%d", repeat + 1,
+ getRepeatCount()));
+ basicRecordingTestByCamera(mCamcorderProfileList, useVideoStab);
+ getResultPrinter().printStatus(getRepeatCount(), repeat + 1, mCameraIds[i]);
+ Thread.sleep(getTestWaitIntervalMs());
+ }
+ } finally {
+ closeDevice();
+ releaseRecorder();
+ }
+ }
+ }
+
+ /**
+ * <p>
+ * Test basic camera recording.
+ * </p>
+ * <p>
+ * This test covers the typical basic use case of camera recording.
+ * MediaRecorder is used to record the audio and video, CamcorderProfile is
+ * used to configure the MediaRecorder. It goes through the pre-defined
+ * CamcorderProfile list, test each profile configuration and validate the
+ * recorded video. Preview is set to the video size.
+ * </p>
+ */
+ public void testBasicRecording() throws Exception {
+ doBasicRecording(/*useVideoStab*/false);
+ }
+
+ /**
+ * <p>
+ * Test video snapshot for each camera.
+ * </p>
+ * <p>
+ * This test covers video snapshot typical use case. The MediaRecorder is used to record the
+ * video for each available video size. The largest still capture size is selected to
+ * capture the JPEG image. The still capture images are validated according to the capture
+ * configuration. The timestamp of capture result before and after video snapshot is also
+ * checked to make sure no frame drop caused by video snapshot.
+ * </p>
+ */
+ public void testVideoSnapshot() throws Exception {
+ videoSnapshotHelper(/*burstTest*/false);
+ }
+
+ public void testConstrainedHighSpeedRecording() throws Exception {
+ constrainedHighSpeedRecording();
+ }
+
+ private void constrainedHighSpeedRecording() throws Exception {
+ for (String id : mCameraIds) {
+ try {
+ Log.i(TAG, "Testing constrained high speed recording for camera " + id);
+ // Re-use the MediaRecorder object for the same camera device.
+ mMediaRecorder = new MediaRecorder();
+ openDevice(id);
+
+ if (!mStaticInfo.isConstrainedHighSpeedVideoSupported()) {
+ Log.i(TAG, "Camera " + id + " doesn't support high speed recording, skipping.");
+ continue;
+ }
+
+ // Test iteration starts...
+ for (int repeat = 0; repeat < getRepeatCount(); ++repeat) {
+ Log.v(TAG, String.format("Constrained high speed recording: %d/%d", repeat + 1,
+ getRepeatCount()));
+
+ StreamConfigurationMap config =
+ mStaticInfo.getValueFromKeyNonNull(
+ CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+ Size[] highSpeedVideoSizes = config.getHighSpeedVideoSizes();
+ for (Size size : highSpeedVideoSizes) {
+ List<Range<Integer>> fixedFpsRanges =
+ getHighSpeedFixedFpsRangeForSize(config, size);
+ mCollector.expectTrue("Unable to find the fixed frame rate fps range for " +
+ "size " + size, fixedFpsRanges.size() > 0);
+ // Test recording for each FPS range
+ for (Range<Integer> fpsRange : fixedFpsRanges) {
+ int captureRate = fpsRange.getLower();
+ final int VIDEO_FRAME_RATE = 30;
+ // Skip the test if the highest recording FPS supported by CamcorderProfile
+ if (fpsRange.getUpper() > getFpsFromHighSpeedProfileForSize(size)) {
+ Log.w(TAG, "high speed recording " + size + "@" + captureRate + "fps"
+ + " is not supported by CamcorderProfile");
+ continue;
+ }
+
+ mOutMediaFileName = VIDEO_FILE_PATH + "/test_cslowMo_video_" + captureRate +
+ "fps_" + id + "_" + size.toString() + ".mp4";
+
+ prepareRecording(size, VIDEO_FRAME_RATE, captureRate);
+
+ // prepare preview surface by using video size.
+ updatePreviewSurfaceWithVideo(size, captureRate);
+
+ // Start recording
+ SimpleCaptureCallback resultListener = new SimpleCaptureCallback();
+ startSlowMotionRecording(/*useMediaRecorder*/true, VIDEO_FRAME_RATE,
+ captureRate, fpsRange, resultListener,
+ /*useHighSpeedSession*/true);
+
+ // Record certain duration.
+ SystemClock.sleep(RECORDING_DURATION_MS);
+
+ // Stop recording and preview
+ stopRecording(/*useMediaRecorder*/true);
+ // Convert number of frames camera produced into the duration in unit of ms.
+ int durationMs = (int) (resultListener.getTotalNumFrames() * 1000.0f /
+ VIDEO_FRAME_RATE);
+
+ // Validation.
+ validateRecording(size, durationMs);
+ }
+
+ getResultPrinter().printStatus(getRepeatCount(), repeat + 1, id);
+ Thread.sleep(getTestWaitIntervalMs());
+ }
+ }
+
+ } finally {
+ closeDevice();
+ releaseRecorder();
+ }
+ }
+ }
+
+ /**
+ * Get high speed FPS from CamcorderProfiles for a given size.
+ *
+ * @param size The size used to search the CamcorderProfiles for the FPS.
+ * @return high speed video FPS, 0 if the given size is not supported by the CamcorderProfiles.
+ */
+ private int getFpsFromHighSpeedProfileForSize(Size size) {
+ for (int quality = CamcorderProfile.QUALITY_HIGH_SPEED_480P;
+ quality <= CamcorderProfile.QUALITY_HIGH_SPEED_2160P; quality++) {
+ if (CamcorderProfile.hasProfile(quality)) {
+ CamcorderProfile profile = CamcorderProfile.get(quality);
+ if (size.equals(new Size(profile.videoFrameWidth, profile.videoFrameHeight))){
+ return profile.videoFrameRate;
+ }
+ }
+ }
+
+ return 0;
+ }
+
+ private List<Range<Integer>> getHighSpeedFixedFpsRangeForSize(StreamConfigurationMap config,
+ Size size) {
+ Range<Integer>[] availableFpsRanges = config.getHighSpeedVideoFpsRangesFor(size);
+ List<Range<Integer>> fixedRanges = new ArrayList<Range<Integer>>();
+ for (Range<Integer> range : availableFpsRanges) {
+ if (range.getLower().equals(range.getUpper())) {
+ fixedRanges.add(range);
+ }
+ }
+ return fixedRanges;
+ }
+
+ private void startSlowMotionRecording(boolean useMediaRecorder, int videoFrameRate,
+ int captureRate, Range<Integer> fpsRange,
+ CameraCaptureSession.CaptureCallback listener, boolean useHighSpeedSession) throws Exception {
+ List<Surface> outputSurfaces = new ArrayList<Surface>(2);
+ assertTrue("Both preview and recording surfaces should be valid",
+ mPreviewSurface.isValid() && mRecordingSurface.isValid());
+ outputSurfaces.add(mPreviewSurface);
+ outputSurfaces.add(mRecordingSurface);
+ // Video snapshot surface
+ if (mReaderSurface != null) {
+ outputSurfaces.add(mReaderSurface);
+ }
+ mSessionListener = new BlockingSessionCallback();
+ mSession = configureCameraSession(mCamera, outputSurfaces, useHighSpeedSession,
+ mSessionListener, mHandler);
+
+ // Create slow motion request list
+ List<CaptureRequest> slowMoRequests = null;
+ if (useHighSpeedSession) {
+ CaptureRequest.Builder requestBuilder =
+ mCamera.createCaptureRequest(CameraDevice.TEMPLATE_RECORD);
+ requestBuilder.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, fpsRange);
+ requestBuilder.addTarget(mPreviewSurface);
+ requestBuilder.addTarget(mRecordingSurface);
+ slowMoRequests = ((CameraConstrainedHighSpeedCaptureSession) mSession).
+ createHighSpeedRequestList(requestBuilder.build());
+ } else {
+ CaptureRequest.Builder recordingRequestBuilder =
+ mCamera.createCaptureRequest(CameraDevice.TEMPLATE_RECORD);
+ recordingRequestBuilder.set(CaptureRequest.CONTROL_MODE,
+ CaptureRequest.CONTROL_MODE_USE_SCENE_MODE);
+ recordingRequestBuilder.set(CaptureRequest.CONTROL_SCENE_MODE,
+ CaptureRequest.CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO);
+
+ CaptureRequest.Builder recordingOnlyBuilder =
+ mCamera.createCaptureRequest(CameraDevice.TEMPLATE_RECORD);
+ recordingOnlyBuilder.set(CaptureRequest.CONTROL_MODE,
+ CaptureRequest.CONTROL_MODE_USE_SCENE_MODE);
+ recordingOnlyBuilder.set(CaptureRequest.CONTROL_SCENE_MODE,
+ CaptureRequest.CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO);
+ int slowMotionFactor = captureRate / videoFrameRate;
+
+ // Make sure camera output frame rate is set to correct value.
+ recordingRequestBuilder.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, fpsRange);
+ recordingRequestBuilder.addTarget(mRecordingSurface);
+ recordingRequestBuilder.addTarget(mPreviewSurface);
+ recordingOnlyBuilder.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, fpsRange);
+ recordingOnlyBuilder.addTarget(mRecordingSurface);
+
+ slowMoRequests = new ArrayList<CaptureRequest>();
+ slowMoRequests.add(recordingRequestBuilder.build());// Preview + recording.
+
+ for (int i = 0; i < slowMotionFactor - 1; i++) {
+ slowMoRequests.add(recordingOnlyBuilder.build()); // Recording only.
+ }
+ }
+
+ mSession.setRepeatingBurst(slowMoRequests, listener, mHandler);
+
+ if (useMediaRecorder) {
+ mMediaRecorder.start();
+ } else {
+ // TODO: need implement MediaCodec path.
+ }
+
+ }
+
+ /**
+ * Test camera recording by using each available CamcorderProfile for a
+ * given camera. preview size is set to the video size.
+ */
+ private void basicRecordingTestByCamera(int[] camcorderProfileList, boolean useVideoStab)
+ throws Exception {
+ Size maxPreviewSize = mOrderedPreviewSizes.get(0);
+ List<Range<Integer> > fpsRanges = Arrays.asList(
+ mStaticInfo.getAeAvailableTargetFpsRangesChecked());
+ int cameraId = Integer.valueOf(mCamera.getId());
+ int maxVideoFrameRate = -1;
+ for (int profileId : camcorderProfileList) {
+ if (!CamcorderProfile.hasProfile(cameraId, profileId) ||
+ allowedUnsupported(cameraId, profileId)) {
+ continue;
+ }
+
+ CamcorderProfile profile = CamcorderProfile.get(cameraId, profileId);
+ Size videoSz = new Size(profile.videoFrameWidth, profile.videoFrameHeight);
+ Range<Integer> fpsRange = new Range(profile.videoFrameRate, profile.videoFrameRate);
+ if (maxVideoFrameRate < profile.videoFrameRate) {
+ maxVideoFrameRate = profile.videoFrameRate;
+ }
+ if (mStaticInfo.isHardwareLevelLegacy() &&
+ (videoSz.getWidth() > maxPreviewSize.getWidth() ||
+ videoSz.getHeight() > maxPreviewSize.getHeight())) {
+ // Skip. Legacy mode can only do recording up to max preview size
+ continue;
+ }
+ assertTrue("Video size " + videoSz.toString() + " for profile ID " + profileId +
+ " must be one of the camera device supported video size!",
+ mSupportedVideoSizes.contains(videoSz));
+ assertTrue("Frame rate range " + fpsRange + " (for profile ID " + profileId +
+ ") must be one of the camera device available FPS range!",
+ fpsRanges.contains(fpsRange));
+
+ if (VERBOSE) {
+ Log.v(TAG, "Testing camera recording with video size " + videoSz.toString());
+ }
+
+ // Configure preview and recording surfaces.
+ mOutMediaFileName = VIDEO_FILE_PATH + "/test_video.mp4";
+ if (DEBUG_DUMP) {
+ mOutMediaFileName = VIDEO_FILE_PATH + "/test_video_" + cameraId + "_"
+ + videoSz.toString() + ".mp4";
+ }
+
+ prepareRecordingWithProfile(profile);
+
+ // prepare preview surface by using video size.
+ updatePreviewSurfaceWithVideo(videoSz, profile.videoFrameRate);
+
+ // Start recording
+ SimpleCaptureCallback resultListener = new SimpleCaptureCallback();
+ startRecording(/* useMediaRecorder */true, resultListener, useVideoStab);
+
+ // Record certain duration.
+ SystemClock.sleep(RECORDING_DURATION_MS);
+
+ // Stop recording and preview
+ stopRecording(/* useMediaRecorder */true);
+ // Convert number of frames camera produced into the duration in unit of ms.
+ int durationMs = (int) (resultListener.getTotalNumFrames() * 1000.0f /
+ profile.videoFrameRate);
+
+ if (VERBOSE) {
+ Log.v(TAG, "video frame rate: " + profile.videoFrameRate +
+ ", num of frames produced: " + resultListener.getTotalNumFrames());
+ }
+
+ // Validation.
+ validateRecording(videoSz, durationMs);
+ }
+ if (maxVideoFrameRate != -1) {
+ // At least one CamcorderProfile is present, check FPS
+ assertTrue("At least one CamcorderProfile must support >= 24 FPS",
+ maxVideoFrameRate >= 24);
+ }
+ }
+
+ /**
+ * Initialize the supported video sizes.
+ */
+ private void initSupportedVideoSize(String cameraId) throws Exception {
+ Size maxVideoSize = SIZE_BOUND_1080P;
+ if (CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_2160P)) {
+ maxVideoSize = SIZE_BOUND_2160P;
+ }
+ mSupportedVideoSizes =
+ getSupportedVideoSizes(cameraId, mCameraManager, maxVideoSize);
+ }
+
+ /**
+ * Simple wrapper to wrap normal/burst video snapshot tests
+ */
+ private void videoSnapshotHelper(boolean burstTest) throws Exception {
+ for (String id : mCameraIds) {
+ try {
+ Log.i(TAG, "Testing video snapshot for camera " + id);
+ // Re-use the MediaRecorder object for the same camera device.
+ mMediaRecorder = new MediaRecorder();
+
+ openDevice(id);
+
+ if (!mStaticInfo.isColorOutputSupported()) {
+ Log.i(TAG, "Camera " + id +
+ " does not support color outputs, skipping");
+ continue;
+ }
+
+ initSupportedVideoSize(id);
+
+ // Test iteration starts...
+ for (int repeat = 0; repeat < getRepeatCount(); ++repeat) {
+ Log.v(TAG, String.format("Video snapshot: %d/%d", repeat + 1,
+ getRepeatCount()));
+ videoSnapshotTestByCamera(burstTest);
+ getResultPrinter().printStatus(getRepeatCount(), repeat + 1, id);
+ Thread.sleep(getTestWaitIntervalMs());
+ }
+ } finally {
+ closeDevice();
+ releaseRecorder();
+ }
+ }
+ }
+
+ /**
+ * Returns {@code true} if the {@link CamcorderProfile} ID is allowed to be unsupported.
+ *
+ * <p>This only allows unsupported profiles when using the LEGACY mode of the Camera API.</p>
+ *
+ * @param profileId a {@link CamcorderProfile} ID to check.
+ * @return {@code true} if supported.
+ */
+ private boolean allowedUnsupported(int cameraId, int profileId) {
+ if (!mStaticInfo.isHardwareLevelLegacy()) {
+ return false;
+ }
+
+ switch(profileId) {
+ case CamcorderProfile.QUALITY_2160P:
+ case CamcorderProfile.QUALITY_1080P:
+ case CamcorderProfile.QUALITY_HIGH:
+ return !CamcorderProfile.hasProfile(cameraId, profileId) ||
+ CamcorderProfile.get(cameraId, profileId).videoFrameWidth >= 1080;
+ }
+ return false;
+ }
+
+ /**
+ * Test video snapshot for each available CamcorderProfile for a given camera.
+ *
+ * <p>
+ * Preview size is set to the video size. For the burst test, frame drop and jittering
+ * is not checked.
+ * </p>
+ *
+ * @param burstTest Perform burst capture or single capture. For burst capture
+ * {@value #BURST_VIDEO_SNAPSHOT_NUM} capture requests will be sent.
+ */
+ private void videoSnapshotTestByCamera(boolean burstTest)
+ throws Exception {
+ final int NUM_SINGLE_SHOT_TEST = 5;
+ final int FRAMEDROP_TOLERANCE = 8;
+ final int FRAME_SIZE_15M = 15000000;
+ final float FRAME_DROP_TOLERENCE_FACTOR = 1.5f;
+ int kFrameDrop_Tolerence = FRAMEDROP_TOLERANCE;
+
+ for (int profileId : mCamcorderProfileList) {
+ int cameraId = Integer.valueOf(mCamera.getId());
+ if (!CamcorderProfile.hasProfile(cameraId, profileId) ||
+ allowedUnsupported(cameraId, profileId)) {
+ continue;
+ }
+
+ CamcorderProfile profile = CamcorderProfile.get(cameraId, profileId);
+ Size videoSz = new Size(profile.videoFrameWidth, profile.videoFrameHeight);
+ Size maxPreviewSize = mOrderedPreviewSizes.get(0);
+
+ if (mStaticInfo.isHardwareLevelLegacy() &&
+ (videoSz.getWidth() > maxPreviewSize.getWidth() ||
+ videoSz.getHeight() > maxPreviewSize.getHeight())) {
+ // Skip. Legacy mode can only do recording up to max preview size
+ continue;
+ }
+
+ if (!mSupportedVideoSizes.contains(videoSz)) {
+ mCollector.addMessage("Video size " + videoSz.toString() + " for profile ID " +
+ profileId + " must be one of the camera device supported video size!");
+ continue;
+ }
+
+ // For LEGACY, find closest supported smaller or equal JPEG size to the current video
+ // size; if no size is smaller than the video, pick the smallest JPEG size. The assert
+ // for video size above guarantees that for LIMITED or FULL, we select videoSz here.
+ // Also check for minFrameDuration here to make sure jpeg stream won't slow down
+ // video capture
+ Size videoSnapshotSz = mOrderedStillSizes.get(mOrderedStillSizes.size() - 1);
+ // Allow a bit tolerance so we don't fail for a few nano seconds of difference
+ final float FRAME_DURATION_TOLERANCE = 0.01f;
+ long videoFrameDuration = (long) (1e9 / profile.videoFrameRate *
+ (1.0 + FRAME_DURATION_TOLERANCE));
+ HashMap<Size, Long> minFrameDurationMap = mStaticInfo.
+ getAvailableMinFrameDurationsForFormatChecked(ImageFormat.JPEG);
+ for (int i = mOrderedStillSizes.size() - 2; i >= 0; i--) {
+ Size candidateSize = mOrderedStillSizes.get(i);
+ if (mStaticInfo.isHardwareLevelLegacy()) {
+ // Legacy level doesn't report min frame duration
+ if (candidateSize.getWidth() <= videoSz.getWidth() &&
+ candidateSize.getHeight() <= videoSz.getHeight()) {
+ videoSnapshotSz = candidateSize;
+ }
+ } else {
+ Long jpegFrameDuration = minFrameDurationMap.get(candidateSize);
+ assertTrue("Cannot find minimum frame duration for jpeg size " + candidateSize,
+ jpegFrameDuration != null);
+ if (candidateSize.getWidth() <= videoSz.getWidth() &&
+ candidateSize.getHeight() <= videoSz.getHeight() &&
+ jpegFrameDuration <= videoFrameDuration) {
+ videoSnapshotSz = candidateSize;
+ }
+ }
+ }
+
+ /**
+ * Only test full res snapshot when below conditions are all true.
+ * 1. Camera is a FULL device
+ * 2. video size is up to max preview size, which will be bounded by 1080p.
+ * 3. Full resolution jpeg stream can keep up to video stream speed.
+ * When full res jpeg stream cannot keep up to video stream speed, search
+ * the largest jpeg size that can susptain video speed instead.
+ */
+ if (mStaticInfo.isHardwareLevelFull() &&
+ videoSz.getWidth() <= maxPreviewSize.getWidth() &&
+ videoSz.getHeight() <= maxPreviewSize.getHeight()) {
+ for (Size jpegSize : mOrderedStillSizes) {
+ Long jpegFrameDuration = minFrameDurationMap.get(jpegSize);
+ assertTrue("Cannot find minimum frame duration for jpeg size " + jpegSize,
+ jpegFrameDuration != null);
+ if (jpegFrameDuration <= videoFrameDuration) {
+ videoSnapshotSz = jpegSize;
+ break;
+ }
+ if (jpegSize.equals(videoSz)) {
+ throw new AssertionFailedError(
+ "Cannot find adequate video snapshot size for video size" +
+ videoSz);
+ }
+ }
+ }
+
+ Log.i(TAG, "Testing video snapshot size " + videoSnapshotSz +
+ " for video size " + videoSz);
+ if (videoSnapshotSz.getWidth() * videoSnapshotSz.getHeight() > FRAME_SIZE_15M)
+ kFrameDrop_Tolerence = (int)(FRAMEDROP_TOLERANCE * FRAME_DROP_TOLERENCE_FACTOR);
+
+ createImageReader(
+ videoSnapshotSz, ImageFormat.JPEG,
+ MAX_VIDEO_SNAPSHOT_IMAGES, /*listener*/null);
+
+ if (VERBOSE) {
+ Log.v(TAG, "Testing camera recording with video size " + videoSz.toString());
+ }
+
+ // Configure preview and recording surfaces.
+ mOutMediaFileName = VIDEO_FILE_PATH + "/test_video.mp4";
+ if (DEBUG_DUMP) {
+ mOutMediaFileName = VIDEO_FILE_PATH + "/test_video_" + cameraId + "_"
+ + videoSz.toString() + ".mp4";
+ }
+
+ int numTestIterations = burstTest ? 1 : NUM_SINGLE_SHOT_TEST;
+ int totalDroppedFrames = 0;
+
+ for (int numTested = 0; numTested < numTestIterations; numTested++) {
+ prepareRecordingWithProfile(profile);
+
+ // prepare video snapshot
+ SimpleCaptureCallback resultListener = new SimpleCaptureCallback();
+ SimpleImageReaderListener imageListener = new SimpleImageReaderListener();
+ CaptureRequest.Builder videoSnapshotRequestBuilder =
+ mCamera.createCaptureRequest((mStaticInfo.isHardwareLevelLegacy()) ?
+ CameraDevice.TEMPLATE_RECORD :
+ CameraDevice.TEMPLATE_VIDEO_SNAPSHOT);
+
+ // prepare preview surface by using video size.
+ updatePreviewSurfaceWithVideo(videoSz, profile.videoFrameRate);
+
+ prepareVideoSnapshot(videoSnapshotRequestBuilder, imageListener);
+ CaptureRequest request = videoSnapshotRequestBuilder.build();
+
+ // Start recording
+ startRecording(/* useMediaRecorder */true, resultListener, /*useVideoStab*/false);
+ long startTime = SystemClock.elapsedRealtime();
+
+ // Record certain duration.
+ SystemClock.sleep(RECORDING_DURATION_MS / 2);
+
+ // take video snapshot
+ if (burstTest) {
+ List<CaptureRequest> requests =
+ new ArrayList<CaptureRequest>(BURST_VIDEO_SNAPSHOT_NUM);
+ for (int i = 0; i < BURST_VIDEO_SNAPSHOT_NUM; i++) {
+ requests.add(request);
+ }
+ mSession.captureBurst(requests, resultListener, mHandler);
+ } else {
+ mSession.capture(request, resultListener, mHandler);
+ }
+
+ // make sure recording is still going after video snapshot
+ SystemClock.sleep(RECORDING_DURATION_MS / 2);
+
+ // Stop recording and preview
+ int durationMs = stopRecording(/* useMediaRecorder */true);
+ // For non-burst test, use number of frames to also double check video frame rate.
+ // Burst video snapshot is allowed to cause frame rate drop, so do not use number
+ // of frames to estimate duration
+ if (!burstTest) {
+ durationMs = (int) (resultListener.getTotalNumFrames() * 1000.0f /
+ profile.videoFrameRate);
+ }
+
+ // Validation recorded video
+ validateRecording(videoSz, durationMs);
+
+ if (burstTest) {
+ for (int i = 0; i < BURST_VIDEO_SNAPSHOT_NUM; i++) {
+ Image image = imageListener.getImage(CAPTURE_IMAGE_TIMEOUT_MS);
+ validateVideoSnapshotCapture(image, videoSnapshotSz);
+ image.close();
+ }
+ } else {
+ // validate video snapshot image
+ Image image = imageListener.getImage(CAPTURE_IMAGE_TIMEOUT_MS);
+ validateVideoSnapshotCapture(image, videoSnapshotSz);
+
+ // validate if there is framedrop around video snapshot
+ totalDroppedFrames += validateFrameDropAroundVideoSnapshot(
+ resultListener, image.getTimestamp());
+
+ //TODO: validate jittering. Should move to PTS
+ //validateJittering(resultListener);
+
+ image.close();
+ }
+ }
+
+ if (!burstTest) {
+ Log.w(TAG, String.format("Camera %d Video size %s: Number of dropped frames " +
+ "detected in %d trials is %d frames.", cameraId, videoSz.toString(),
+ numTestIterations, totalDroppedFrames));
+ mCollector.expectLessOrEqual(
+ String.format(
+ "Camera %d Video size %s: Number of dropped frames %d must not"
+ + " be larger than %d",
+ cameraId, videoSz.toString(), totalDroppedFrames,
+ kFrameDrop_Tolerence),
+ kFrameDrop_Tolerence, totalDroppedFrames);
+ }
+ closeImageReader();
+ }
+ }
+
+ /**
+ * Configure video snapshot request according to the still capture size
+ */
+ private void prepareVideoSnapshot(
+ CaptureRequest.Builder requestBuilder,
+ ImageReader.OnImageAvailableListener imageListener)
+ throws Exception {
+ mReader.setOnImageAvailableListener(imageListener, mHandler);
+ assertNotNull("Recording surface must be non-null!", mRecordingSurface);
+ requestBuilder.addTarget(mRecordingSurface);
+ assertNotNull("Preview surface must be non-null!", mPreviewSurface);
+ requestBuilder.addTarget(mPreviewSurface);
+ assertNotNull("Reader surface must be non-null!", mReaderSurface);
+ requestBuilder.addTarget(mReaderSurface);
+ }
+
+ /**
+ * Update preview size with video size.
+ *
+ * <p>Preview size will be capped with max preview size.</p>
+ *
+ * @param videoSize The video size used for preview.
+ * @param videoFrameRate The video frame rate
+ *
+ */
+ private void updatePreviewSurfaceWithVideo(Size videoSize, int videoFrameRate) {
+ if (mOrderedPreviewSizes == null) {
+ throw new IllegalStateException("supported preview size list is not initialized yet");
+ }
+ final float FRAME_DURATION_TOLERANCE = 0.01f;
+ long videoFrameDuration = (long) (1e9 / videoFrameRate *
+ (1.0 + FRAME_DURATION_TOLERANCE));
+ HashMap<Size, Long> minFrameDurationMap = mStaticInfo.
+ getAvailableMinFrameDurationsForFormatChecked(ImageFormat.PRIVATE);
+ Size maxPreviewSize = mOrderedPreviewSizes.get(0);
+ Size previewSize = null;
+ if (videoSize.getWidth() > maxPreviewSize.getWidth() ||
+ videoSize.getHeight() > maxPreviewSize.getHeight()) {
+ for (Size s : mOrderedPreviewSizes) {
+ Long frameDuration = minFrameDurationMap.get(s);
+ if (mStaticInfo.isHardwareLevelLegacy()) {
+ // Legacy doesn't report min frame duration
+ frameDuration = new Long(0);
+ }
+ assertTrue("Cannot find minimum frame duration for private size" + s,
+ frameDuration != null);
+ if (frameDuration <= videoFrameDuration &&
+ s.getWidth() <= videoSize.getWidth() &&
+ s.getHeight() <= videoSize.getHeight()) {
+ Log.w(TAG, "Overwrite preview size from " + videoSize.toString() +
+ " to " + s.toString());
+ previewSize = s;
+ break;
+ // If all preview size doesn't work then we fallback to video size
+ }
+ }
+ }
+ if (previewSize == null) {
+ previewSize = videoSize;
+ }
+ updatePreviewSurface(previewSize);
+ }
+
+ /**
+ * Configure MediaRecorder recording session with CamcorderProfile, prepare
+ * the recording surface.
+ */
+ private void prepareRecordingWithProfile(CamcorderProfile profile)
+ throws Exception {
+ // Prepare MediaRecorder.
+ mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.CAMCORDER);
+ mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.SURFACE);
+ mMediaRecorder.setProfile(profile);
+ mMediaRecorder.setOutputFile(mOutMediaFileName);
+ if (mPersistentSurface != null) {
+ mMediaRecorder.setInputSurface(mPersistentSurface);
+ mRecordingSurface = mPersistentSurface;
+ }
+ mMediaRecorder.prepare();
+ if (mPersistentSurface == null) {
+ mRecordingSurface = mMediaRecorder.getSurface();
+ }
+ assertNotNull("Recording surface must be non-null!", mRecordingSurface);
+ mVideoFrameRate = profile.videoFrameRate;
+ mVideoSize = new Size(profile.videoFrameWidth, profile.videoFrameHeight);
+ }
+
+ /**
+ * Configure MediaRecorder recording session with CamcorderProfile, prepare
+ * the recording surface. Use AVC for video compression, AAC for audio compression.
+ * Both are required for android devices by android CDD.
+ */
+ private void prepareRecording(Size sz, int videoFrameRate, int captureRate)
+ throws Exception {
+ // Prepare MediaRecorder.
+ mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.CAMCORDER);
+ mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.SURFACE);
+ mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
+ mMediaRecorder.setOutputFile(mOutMediaFileName);
+ mMediaRecorder.setVideoEncodingBitRate(getVideoBitRate(sz));
+ mMediaRecorder.setVideoFrameRate(videoFrameRate);
+ mMediaRecorder.setCaptureRate(captureRate);
+ mMediaRecorder.setVideoSize(sz.getWidth(), sz.getHeight());
+ mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264);
+ mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
+ if (mPersistentSurface != null) {
+ mMediaRecorder.setInputSurface(mPersistentSurface);
+ mRecordingSurface = mPersistentSurface;
+ }
+ mMediaRecorder.prepare();
+ if (mPersistentSurface == null) {
+ mRecordingSurface = mMediaRecorder.getSurface();
+ }
+ assertNotNull("Recording surface must be non-null!", mRecordingSurface);
+ mVideoFrameRate = videoFrameRate;
+ mVideoSize = sz;
+ }
+
+ private void startRecording(boolean useMediaRecorder,
+ CameraCaptureSession.CaptureCallback listener, boolean useVideoStab) throws Exception {
+ if (!mStaticInfo.isVideoStabilizationSupported() && useVideoStab) {
+ throw new IllegalArgumentException("Video stabilization is not supported");
+ }
+
+ List<Surface> outputSurfaces = new ArrayList<Surface>(2);
+ assertTrue("Both preview and recording surfaces should be valid",
+ mPreviewSurface.isValid() && mRecordingSurface.isValid());
+ outputSurfaces.add(mPreviewSurface);
+ outputSurfaces.add(mRecordingSurface);
+ // Video snapshot surface
+ if (mReaderSurface != null) {
+ outputSurfaces.add(mReaderSurface);
+ }
+ mSessionListener = new BlockingSessionCallback();
+ mSession = configureCameraSession(mCamera, outputSurfaces, mSessionListener, mHandler);
+
+ CaptureRequest.Builder recordingRequestBuilder =
+ mCamera.createCaptureRequest(CameraDevice.TEMPLATE_RECORD);
+ // Make sure camera output frame rate is set to correct value.
+ Range<Integer> fpsRange = Range.create(mVideoFrameRate, mVideoFrameRate);
+ recordingRequestBuilder.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, fpsRange);
+ if (useVideoStab) {
+ recordingRequestBuilder.set(CaptureRequest.CONTROL_VIDEO_STABILIZATION_MODE,
+ CaptureRequest.CONTROL_VIDEO_STABILIZATION_MODE_ON);
+ }
+ recordingRequestBuilder.addTarget(mRecordingSurface);
+ recordingRequestBuilder.addTarget(mPreviewSurface);
+ mSession.setRepeatingRequest(recordingRequestBuilder.build(), listener, mHandler);
+
+ if (useMediaRecorder) {
+ mMediaRecorder.start();
+ } else {
+ // TODO: need implement MediaCodec path.
+ }
+ mRecordingStartTime = SystemClock.elapsedRealtime();
+ }
+
+ private void stopCameraStreaming() throws Exception {
+ if (VERBOSE) {
+ Log.v(TAG, "Stopping camera streaming and waiting for idle");
+ }
+ // Stop repeating, wait for captures to complete, and disconnect from
+ // surfaces
+ mSession.close();
+ mSessionListener.getStateWaiter().waitForState(SESSION_CLOSED, SESSION_CLOSE_TIMEOUT_MS);
+ }
+
+ // Stop recording and return the estimated video duration in milliseconds.
+ private int stopRecording(boolean useMediaRecorder) throws Exception {
+ long stopRecordingTime = SystemClock.elapsedRealtime();
+ if (useMediaRecorder) {
+ stopCameraStreaming();
+
+ mMediaRecorder.stop();
+ // Can reuse the MediaRecorder object after reset.
+ mMediaRecorder.reset();
+ } else {
+ // TODO: need implement MediaCodec path.
+ }
+ if (mPersistentSurface == null && mRecordingSurface != null) {
+ mRecordingSurface.release();
+ mRecordingSurface = null;
+ }
+ return (int) (stopRecordingTime - mRecordingStartTime);
+ }
+
+ private void releaseRecorder() {
+ if (mMediaRecorder != null) {
+ mMediaRecorder.release();
+ mMediaRecorder = null;
+ }
+ }
+
+ private void validateRecording(Size sz, int expectedDurationMs) throws Exception {
+ File outFile = new File(mOutMediaFileName);
+ assertTrue("No video is recorded", outFile.exists());
+
+ MediaExtractor extractor = new MediaExtractor();
+ try {
+ extractor.setDataSource(mOutMediaFileName);
+ long durationUs = 0;
+ int width = -1, height = -1;
+ int numTracks = extractor.getTrackCount();
+ final String VIDEO_MIME_TYPE = "video";
+ for (int i = 0; i < numTracks; i++) {
+ MediaFormat format = extractor.getTrackFormat(i);
+ String mime = format.getString(MediaFormat.KEY_MIME);
+ if (mime.contains(VIDEO_MIME_TYPE)) {
+ Log.i(TAG, "video format is: " + format.toString());
+ durationUs = format.getLong(MediaFormat.KEY_DURATION);
+ width = format.getInteger(MediaFormat.KEY_WIDTH);
+ height = format.getInteger(MediaFormat.KEY_HEIGHT);
+ break;
+ }
+ }
+ Size videoSz = new Size(width, height);
+ assertTrue("Video size doesn't match, expected " + sz.toString() +
+ " got " + videoSz.toString(), videoSz.equals(sz));
+ int duration = (int) (durationUs / 1000);
+ if (VERBOSE) {
+ Log.v(TAG, String.format("Video duration: recorded %dms, expected %dms",
+ duration, expectedDurationMs));
+ }
+
+ // TODO: Don't skip this for video snapshot
+ if (!mStaticInfo.isHardwareLevelLegacy()) {
+ assertTrue(String.format(
+ "Camera %s: Video duration doesn't match: recorded %dms, expected %dms.",
+ mCamera.getId(), duration, expectedDurationMs),
+ Math.abs(duration - expectedDurationMs) <
+ DURATION_MARGIN * expectedDurationMs);
+ }
+ } finally {
+ extractor.release();
+ if (!DEBUG_DUMP) {
+ outFile.delete();
+ }
+ }
+ }
+
+ /**
+ * Validate video snapshot capture image object sanity and test.
+ *
+ * <p> Check for size, format and jpeg decoding</p>
+ *
+ * @param image The JPEG image to be verified.
+ * @param size The JPEG capture size to be verified against.
+ */
+ private void validateVideoSnapshotCapture(Image image, Size size) {
+ CameraTestUtils.validateImage(image, size.getWidth(), size.getHeight(),
+ ImageFormat.JPEG, /*filePath*/null);
+ }
+
+ /**
+ * Validate if video snapshot causes frame drop.
+ * Here frame drop is defined as frame duration >= 2 * expected frame duration.
+ * Return the estimated number of frames dropped during video snapshot
+ */
+ private int validateFrameDropAroundVideoSnapshot(
+ SimpleCaptureCallback resultListener, long imageTimeStamp) {
+ double expectedDurationMs = 1000.0 / mVideoFrameRate;
+ CaptureResult prevResult = resultListener.getCaptureResult(WAIT_FOR_RESULT_TIMEOUT_MS);
+ long prevTS = getValueNotNull(prevResult, CaptureResult.SENSOR_TIMESTAMP);
+ while (!resultListener.hasMoreResults()) {
+ CaptureResult currentResult =
+ resultListener.getCaptureResult(WAIT_FOR_RESULT_TIMEOUT_MS);
+ long currentTS = getValueNotNull(currentResult, CaptureResult.SENSOR_TIMESTAMP);
+ if (currentTS == imageTimeStamp) {
+ // validate the timestamp before and after, then return
+ CaptureResult nextResult =
+ resultListener.getCaptureResult(WAIT_FOR_RESULT_TIMEOUT_MS);
+ long nextTS = getValueNotNull(nextResult, CaptureResult.SENSOR_TIMESTAMP);
+ double durationMs = (currentTS - prevTS) / 1000000.0;
+ int totalFramesDropped = 0;
+
+ // Snapshots in legacy mode pause the preview briefly. Skip the duration
+ // requirements for legacy mode unless this is fixed.
+ if (!mStaticInfo.isHardwareLevelLegacy()) {
+ mCollector.expectTrue(
+ String.format(
+ "Video %dx%d Frame drop detected before video snapshot: " +
+ "duration %.2fms (expected %.2fms)",
+ mVideoSize.getWidth(), mVideoSize.getHeight(),
+ durationMs, expectedDurationMs
+ ),
+ durationMs <= (expectedDurationMs * MAX_NUM_FRAME_DROP_INTERVAL_ALLOWED)
+ );
+ // Log a warning is there is any frame drop detected.
+ if (durationMs >= expectedDurationMs * 2) {
+ Log.w(TAG, String.format(
+ "Video %dx%d Frame drop detected before video snapshot: " +
+ "duration %.2fms (expected %.2fms)",
+ mVideoSize.getWidth(), mVideoSize.getHeight(),
+ durationMs, expectedDurationMs
+ ));
+ }
+
+ durationMs = (nextTS - currentTS) / 1000000.0;
+ mCollector.expectTrue(
+ String.format(
+ "Video %dx%d Frame drop detected after video snapshot: " +
+ "duration %.2fms (expected %.2fms)",
+ mVideoSize.getWidth(), mVideoSize.getHeight(),
+ durationMs, expectedDurationMs
+ ),
+ durationMs <= (expectedDurationMs * MAX_NUM_FRAME_DROP_INTERVAL_ALLOWED)
+ );
+ // Log a warning is there is any frame drop detected.
+ if (durationMs >= expectedDurationMs * 2) {
+ Log.w(TAG, String.format(
+ "Video %dx%d Frame drop detected after video snapshot: " +
+ "duration %fms (expected %fms)",
+ mVideoSize.getWidth(), mVideoSize.getHeight(),
+ durationMs, expectedDurationMs
+ ));
+ }
+
+ double totalDurationMs = (nextTS - prevTS) / 1000000.0;
+ // Minus 2 for the expected 2 frames interval
+ totalFramesDropped = (int) (totalDurationMs / expectedDurationMs) - 2;
+ if (totalFramesDropped < 0) {
+ Log.w(TAG, "totalFrameDropped is " + totalFramesDropped +
+ ". Video frame rate might be too fast.");
+ }
+ totalFramesDropped = Math.max(0, totalFramesDropped);
+ }
+ return totalFramesDropped;
+ }
+ prevTS = currentTS;
+ }
+ throw new AssertionFailedError(
+ "Video snapshot timestamp does not match any of capture results!");
+ }
+
+ /**
+ * Calculate a video bit rate based on the size. The bit rate is scaled
+ * based on ratio of video size to 1080p size.
+ */
+ private int getVideoBitRate(Size sz) {
+ int rate = BIT_RATE_1080P;
+ float scaleFactor = sz.getHeight() * sz.getWidth() / (float)(1920 * 1080);
+ rate = (int)(rate * scaleFactor);
+
+ // Clamp to the MIN, MAX range.
+ return Math.max(BIT_RATE_MIN, Math.min(BIT_RATE_MAX, rate));
+ }
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2ReprocessCaptureTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2ReprocessCaptureTest.java
new file mode 100644
index 0000000..2dac371
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2ReprocessCaptureTest.java
@@ -0,0 +1,1162 @@
+/*
+ * Copyright 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mediaframeworktest.stress;
+
+import com.android.ex.camera2.blocking.BlockingSessionCallback;
+import com.android.mediaframeworktest.Camera2SurfaceViewTestCase;
+import com.android.mediaframeworktest.helpers.CameraTestUtils;
+import com.android.mediaframeworktest.helpers.StaticMetadata;
+
+import android.graphics.ImageFormat;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CaptureFailure;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.hardware.camera2.TotalCaptureResult;
+import android.hardware.camera2.params.InputConfiguration;
+import android.media.Image;
+import android.media.ImageReader;
+import android.media.ImageWriter;
+import android.util.Log;
+import android.util.Size;
+import android.view.Surface;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.EXIF_TEST_DATA;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.SESSION_CLOSE_TIMEOUT_MS;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.SimpleCaptureCallback;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.SimpleImageReaderListener;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.SimpleImageWriterListener;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.configureReprocessableCameraSession;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.dumpFile;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.getAscendingOrderSizes;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.getDataFromImage;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.makeImageReader;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.setJpegKeys;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.verifyJpegKeys;
+
+/**
+ * <p>Tests for Reprocess API.</p>
+ *
+ * adb shell am instrument \
+ * -e class \
+ * com.android.mediaframeworktest.stress.Camera2StillCaptureTest#Camera2ReprocessCaptureTest \
+ * -e repeat 1 \
+ * -e waitIntervalMs 1000 \
+ * -e resultToFile false \
+ * -r -w com.android.mediaframeworktest/.Camera2InstrumentationTestRunner
+ */
+public class Camera2ReprocessCaptureTest extends Camera2SurfaceViewTestCase {
+ private static final String TAG = "ReprocessCaptureTest";
+ private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
+ private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+ private static final int CAPTURE_TIMEOUT_FRAMES = 100;
+ private static final int CAPTURE_TIMEOUT_MS = 3000;
+ private static final int WAIT_FOR_SURFACE_CHANGE_TIMEOUT_MS = 1000;
+ private static final int CAPTURE_TEMPLATE = CameraDevice.TEMPLATE_ZERO_SHUTTER_LAG;
+ private static final int ZSL_TEMPLATE = CameraDevice.TEMPLATE_ZERO_SHUTTER_LAG;
+ private static final int NUM_REPROCESS_TEST_LOOP = 3;
+ private static final int NUM_REPROCESS_CAPTURES = 3;
+ private static final int NUM_REPROCESS_BURST = 3;
+ private int mDumpFrameCount = 0;
+
+ // The image reader for the first regular capture
+ private ImageReader mFirstImageReader;
+ // The image reader for the reprocess capture
+ private ImageReader mSecondImageReader;
+ // A flag indicating whether the regular capture and the reprocess capture share the same image
+ // reader. If it's true, mFirstImageReader should be used for regular and reprocess outputs.
+ private boolean mShareOneImageReader;
+ private SimpleImageReaderListener mFirstImageReaderListener;
+ private SimpleImageReaderListener mSecondImageReaderListener;
+ private Surface mInputSurface;
+ private ImageWriter mImageWriter;
+ private SimpleImageWriterListener mImageWriterListener;
+
+ private enum CaptureTestCase {
+ SINGLE_SHOT,
+ BURST,
+ MIXED_BURST,
+ ABORT_CAPTURE,
+ TIMESTAMPS,
+ JPEG_EXIF,
+ REQUEST_KEYS,
+ }
+
+ /**
+ * Test YUV_420_888 -> JPEG with maximal supported sizes
+ */
+ public void testBasicYuvToJpegReprocessing() throws Exception {
+ for (String id : mCameraIds) {
+ if (!isYuvReprocessSupported(id)) {
+ continue;
+ }
+
+ // Test iteration starts...
+ for (int repeat = 0; repeat < getRepeatCount(); ++repeat) {
+ Log.v(TAG, String.format("Reprocessing YUV to JPEG: %d/%d", repeat + 1,
+ getRepeatCount()));
+ // YUV_420_888 -> JPEG must be supported.
+ testBasicReprocessing(id, ImageFormat.YUV_420_888, ImageFormat.JPEG);
+ getResultPrinter().printStatus(getRepeatCount(), repeat + 1, id);
+ Thread.sleep(getTestWaitIntervalMs());
+ }
+ }
+ }
+
+ /**
+ * Test OPAQUE -> JPEG with maximal supported sizes
+ */
+ public void testBasicOpaqueToJpegReprocessing() throws Exception {
+ for (String id : mCameraIds) {
+ if (!isOpaqueReprocessSupported(id)) {
+ continue;
+ }
+
+ // Test iteration starts...
+ for (int repeat = 0; repeat < getRepeatCount(); ++repeat) {
+ Log.v(TAG, String.format("Reprocessing OPAQUE to JPEG: %d/%d", repeat + 1,
+ getRepeatCount()));
+ // OPAQUE -> JPEG must be supported.
+ testBasicReprocessing(id, ImageFormat.PRIVATE, ImageFormat.JPEG);
+ getResultPrinter().printStatus(getRepeatCount(), repeat + 1, id);
+ Thread.sleep(getTestWaitIntervalMs());
+ }
+
+ }
+ }
+
+ /**
+ * Test all supported size and format combinations with preview.
+ */
+ public void testReprocessingSizeFormatWithPreview() throws Exception {
+ for (String id : mCameraIds) {
+ if (!isYuvReprocessSupported(id) && !isOpaqueReprocessSupported(id)) {
+ continue;
+ }
+
+ try {
+ // open Camera device
+ openDevice(id);
+
+ // Test iteration starts...
+ for (int repeat = 0; repeat < getRepeatCount(); ++repeat) {
+ Log.v(TAG, String.format("Reprocessing size format with preview: %d/%d",
+ repeat + 1, getRepeatCount()));
+ testReprocessingAllCombinations(id, mOrderedPreviewSizes.get(0),
+ CaptureTestCase.SINGLE_SHOT);
+ getResultPrinter().printStatus(getRepeatCount(), repeat + 1, id);
+ Thread.sleep(getTestWaitIntervalMs());
+ }
+ } finally {
+ closeDevice();
+ }
+ }
+ }
+
+ /**
+ * Test burst captures mixed with regular and reprocess captures with and without preview.
+ */
+ public void testMixedBurstReprocessing() throws Exception {
+ for (String id : mCameraIds) {
+ if (!isYuvReprocessSupported(id) && !isOpaqueReprocessSupported(id)) {
+ continue;
+ }
+
+ try {
+ // open Camera device
+ openDevice(id);
+
+ // Test iteration starts...
+ for (int repeat = 0; repeat < getRepeatCount(); ++repeat) {
+ Log.v(TAG, String.format("Reprocessing mixed burst with or without preview: "
+ + "%d/%d", repeat + 1, getRepeatCount()));
+ // no preview
+ testReprocessingAllCombinations(id, /*previewSize*/null,
+ CaptureTestCase.MIXED_BURST);
+ // with preview
+ testReprocessingAllCombinations(id, mOrderedPreviewSizes.get(0),
+ CaptureTestCase.MIXED_BURST);
+ getResultPrinter().printStatus(getRepeatCount(), repeat + 1, id);
+ Thread.sleep(getTestWaitIntervalMs());
+ }
+ } finally {
+ closeDevice();
+ }
+ }
+ }
+
+ /**
+ * Test the input format and output format with the largest input and output sizes.
+ */
+ private void testBasicReprocessing(String cameraId, int inputFormat,
+ int reprocessOutputFormat) throws Exception {
+ try {
+ openDevice(cameraId);
+
+ testReprocessingMaxSizes(cameraId, inputFormat, reprocessOutputFormat,
+ /* previewSize */null, CaptureTestCase.SINGLE_SHOT);
+ } finally {
+ closeDevice();
+ }
+ }
+
+ /**
+ * Test the input format and output format with the largest input and output sizes for a
+ * certain test case.
+ */
+ private void testReprocessingMaxSizes(String cameraId, int inputFormat,
+ int reprocessOutputFormat, Size previewSize, CaptureTestCase captureTestCase)
+ throws Exception {
+ Size maxInputSize = getMaxSize(inputFormat, StaticMetadata.StreamDirection.Input);
+ Size maxReprocessOutputSize =
+ getMaxSize(reprocessOutputFormat, StaticMetadata.StreamDirection.Output);
+
+ switch (captureTestCase) {
+ case SINGLE_SHOT:
+ testReprocess(cameraId, maxInputSize, inputFormat, maxReprocessOutputSize,
+ reprocessOutputFormat, previewSize, NUM_REPROCESS_CAPTURES);
+ break;
+ case ABORT_CAPTURE:
+ testReprocessAbort(cameraId, maxInputSize, inputFormat, maxReprocessOutputSize,
+ reprocessOutputFormat);
+ break;
+ case TIMESTAMPS:
+ testReprocessTimestamps(cameraId, maxInputSize, inputFormat, maxReprocessOutputSize,
+ reprocessOutputFormat);
+ break;
+ case JPEG_EXIF:
+ testReprocessJpegExif(cameraId, maxInputSize, inputFormat, maxReprocessOutputSize);
+ break;
+ case REQUEST_KEYS:
+ testReprocessRequestKeys(cameraId, maxInputSize, inputFormat,
+ maxReprocessOutputSize, reprocessOutputFormat);
+ break;
+ default:
+ throw new IllegalArgumentException("Invalid test case");
+ }
+ }
+
+ /**
+ * Test all input format, input size, output format, and output size combinations.
+ */
+ private void testReprocessingAllCombinations(String cameraId, Size previewSize,
+ CaptureTestCase captureTestCase) throws Exception {
+
+ int[] supportedInputFormats =
+ mStaticInfo.getAvailableFormats(StaticMetadata.StreamDirection.Input);
+ for (int inputFormat : supportedInputFormats) {
+ Size[] supportedInputSizes =
+ mStaticInfo.getAvailableSizesForFormatChecked(inputFormat,
+ StaticMetadata.StreamDirection.Input);
+
+ for (Size inputSize : supportedInputSizes) {
+ int[] supportedReprocessOutputFormats =
+ mStaticInfo.getValidOutputFormatsForInput(inputFormat);
+
+ for (int reprocessOutputFormat : supportedReprocessOutputFormats) {
+ Size[] supportedReprocessOutputSizes =
+ mStaticInfo.getAvailableSizesForFormatChecked(reprocessOutputFormat,
+ StaticMetadata.StreamDirection.Output);
+
+ for (Size reprocessOutputSize : supportedReprocessOutputSizes) {
+ switch (captureTestCase) {
+ case SINGLE_SHOT:
+ testReprocess(cameraId, inputSize, inputFormat,
+ reprocessOutputSize, reprocessOutputFormat, previewSize,
+ NUM_REPROCESS_CAPTURES);
+ break;
+ case BURST:
+ testReprocessBurst(cameraId, inputSize, inputFormat,
+ reprocessOutputSize, reprocessOutputFormat, previewSize,
+ NUM_REPROCESS_BURST);
+ break;
+ case MIXED_BURST:
+ testReprocessMixedBurst(cameraId, inputSize, inputFormat,
+ reprocessOutputSize, reprocessOutputFormat, previewSize,
+ NUM_REPROCESS_BURST);
+ break;
+ default:
+ throw new IllegalArgumentException("Invalid test case");
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Test burst that is mixed with regular and reprocess capture requests.
+ */
+ private void testReprocessMixedBurst(String cameraId, Size inputSize, int inputFormat,
+ Size reprocessOutputSize, int reprocessOutputFormat, Size previewSize,
+ int numBurst) throws Exception {
+ if (VERBOSE) {
+ Log.v(TAG, "testReprocessMixedBurst: cameraId: " + cameraId + " inputSize: " +
+ inputSize + " inputFormat: " + inputFormat + " reprocessOutputSize: " +
+ reprocessOutputSize + " reprocessOutputFormat: " + reprocessOutputFormat +
+ " previewSize: " + previewSize + " numBurst: " + numBurst);
+ }
+
+ boolean enablePreview = (previewSize != null);
+ ImageResultHolder[] imageResultHolders = new ImageResultHolder[0];
+
+ try {
+ // totalNumBurst = number of regular burst + number of reprocess burst.
+ int totalNumBurst = numBurst * 2;
+
+ if (enablePreview) {
+ updatePreviewSurface(previewSize);
+ } else {
+ mPreviewSurface = null;
+ }
+
+ setupImageReaders(inputSize, inputFormat, reprocessOutputSize, reprocessOutputFormat,
+ totalNumBurst);
+ setupReprocessableSession(mPreviewSurface, /*numImageWriterImages*/numBurst);
+
+ if (enablePreview) {
+ startPreview(mPreviewSurface);
+ }
+
+ // Prepare an array of booleans indicating each capture's type (regular or reprocess)
+ boolean[] isReprocessCaptures = new boolean[totalNumBurst];
+ for (int i = 0; i < totalNumBurst; i++) {
+ if ((i & 1) == 0) {
+ isReprocessCaptures[i] = true;
+ } else {
+ isReprocessCaptures[i] = false;
+ }
+ }
+
+ imageResultHolders = doMixedReprocessBurstCapture(isReprocessCaptures);
+ for (ImageResultHolder holder : imageResultHolders) {
+ Image reprocessedImage = holder.getImage();
+ TotalCaptureResult result = holder.getTotalCaptureResult();
+
+ mCollector.expectImageProperties("testReprocessMixedBurst", reprocessedImage,
+ reprocessOutputFormat, reprocessOutputSize,
+ result.get(CaptureResult.SENSOR_TIMESTAMP));
+
+ if (DEBUG) {
+ Log.d(TAG, String.format("camera %s in %dx%d %d out %dx%d %d",
+ cameraId, inputSize.getWidth(), inputSize.getHeight(), inputFormat,
+ reprocessOutputSize.getWidth(), reprocessOutputSize.getHeight(),
+ reprocessOutputFormat));
+ dumpImage(reprocessedImage,
+ "/testReprocessMixedBurst_camera" + cameraId + "_" + mDumpFrameCount);
+ mDumpFrameCount++;
+ }
+ }
+ } finally {
+ for (ImageResultHolder holder : imageResultHolders) {
+ holder.getImage().close();
+ }
+ closeReprossibleSession();
+ closeImageReaders();
+ }
+ }
+
+ /**
+ * Test burst of reprocess capture requests.
+ */
+ private void testReprocessBurst(String cameraId, Size inputSize, int inputFormat,
+ Size reprocessOutputSize, int reprocessOutputFormat, Size previewSize,
+ int numBurst) throws Exception {
+ if (VERBOSE) {
+ Log.v(TAG, "testReprocessBurst: cameraId: " + cameraId + " inputSize: " +
+ inputSize + " inputFormat: " + inputFormat + " reprocessOutputSize: " +
+ reprocessOutputSize + " reprocessOutputFormat: " + reprocessOutputFormat +
+ " previewSize: " + previewSize + " numBurst: " + numBurst);
+ }
+
+ boolean enablePreview = (previewSize != null);
+ ImageResultHolder[] imageResultHolders = new ImageResultHolder[0];
+
+ try {
+ if (enablePreview) {
+ updatePreviewSurface(previewSize);
+ } else {
+ mPreviewSurface = null;
+ }
+
+ setupImageReaders(inputSize, inputFormat, reprocessOutputSize, reprocessOutputFormat,
+ numBurst);
+ setupReprocessableSession(mPreviewSurface, numBurst);
+
+ if (enablePreview) {
+ startPreview(mPreviewSurface);
+ }
+
+ imageResultHolders = doReprocessBurstCapture(numBurst);
+ for (ImageResultHolder holder : imageResultHolders) {
+ Image reprocessedImage = holder.getImage();
+ TotalCaptureResult result = holder.getTotalCaptureResult();
+
+ mCollector.expectImageProperties("testReprocessBurst", reprocessedImage,
+ reprocessOutputFormat, reprocessOutputSize,
+ result.get(CaptureResult.SENSOR_TIMESTAMP));
+
+ if (DEBUG) {
+ Log.d(TAG, String.format("camera %s in %dx%d %d out %dx%d %d",
+ cameraId, inputSize.getWidth(), inputSize.getHeight(), inputFormat,
+ reprocessOutputSize.getWidth(), reprocessOutputSize.getHeight(),
+ reprocessOutputFormat));
+ dumpImage(reprocessedImage,
+ "/testReprocessBurst_camera" + cameraId + "_" + mDumpFrameCount);
+ mDumpFrameCount++;
+ }
+ }
+ } finally {
+ for (ImageResultHolder holder : imageResultHolders) {
+ holder.getImage().close();
+ }
+ closeReprossibleSession();
+ closeImageReaders();
+ }
+ }
+
+ /**
+ * Test a sequences of reprocess capture requests.
+ */
+ private void testReprocess(String cameraId, Size inputSize, int inputFormat,
+ Size reprocessOutputSize, int reprocessOutputFormat, Size previewSize,
+ int numReprocessCaptures) throws Exception {
+ if (VERBOSE) {
+ Log.v(TAG, "testReprocess: cameraId: " + cameraId + " inputSize: " +
+ inputSize + " inputFormat: " + inputFormat + " reprocessOutputSize: " +
+ reprocessOutputSize + " reprocessOutputFormat: " + reprocessOutputFormat +
+ " previewSize: " + previewSize);
+ }
+
+ boolean enablePreview = (previewSize != null);
+
+ try {
+ if (enablePreview) {
+ updatePreviewSurface(previewSize);
+ } else {
+ mPreviewSurface = null;
+ }
+
+ setupImageReaders(inputSize, inputFormat, reprocessOutputSize, reprocessOutputFormat,
+ /*maxImages*/1);
+ setupReprocessableSession(mPreviewSurface, /*numImageWriterImages*/1);
+
+ if (enablePreview) {
+ startPreview(mPreviewSurface);
+ }
+
+ for (int i = 0; i < numReprocessCaptures; i++) {
+ ImageResultHolder imageResultHolder = null;
+
+ try {
+ imageResultHolder = doReprocessCapture();
+ Image reprocessedImage = imageResultHolder.getImage();
+ TotalCaptureResult result = imageResultHolder.getTotalCaptureResult();
+
+ mCollector.expectImageProperties("testReprocess", reprocessedImage,
+ reprocessOutputFormat, reprocessOutputSize,
+ result.get(CaptureResult.SENSOR_TIMESTAMP));
+
+ if (DEBUG) {
+ Log.d(TAG, String.format("camera %s in %dx%d %d out %dx%d %d",
+ cameraId, inputSize.getWidth(), inputSize.getHeight(), inputFormat,
+ reprocessOutputSize.getWidth(), reprocessOutputSize.getHeight(),
+ reprocessOutputFormat));
+
+ dumpImage(reprocessedImage,
+ "/testReprocess_camera" + cameraId + "_" + mDumpFrameCount);
+ mDumpFrameCount++;
+ }
+ } finally {
+ if (imageResultHolder != null) {
+ imageResultHolder.getImage().close();
+ }
+ }
+ }
+ } finally {
+ closeReprossibleSession();
+ closeImageReaders();
+ }
+ }
+
+ /**
+ * Test aborting a burst reprocess capture and multiple single reprocess captures.
+ */
+ private void testReprocessAbort(String cameraId, Size inputSize, int inputFormat,
+ Size reprocessOutputSize, int reprocessOutputFormat) throws Exception {
+ if (VERBOSE) {
+ Log.v(TAG, "testReprocessAbort: cameraId: " + cameraId + " inputSize: " +
+ inputSize + " inputFormat: " + inputFormat + " reprocessOutputSize: " +
+ reprocessOutputSize + " reprocessOutputFormat: " + reprocessOutputFormat);
+ }
+
+ try {
+ setupImageReaders(inputSize, inputFormat, reprocessOutputSize, reprocessOutputFormat,
+ NUM_REPROCESS_CAPTURES);
+ setupReprocessableSession(/*previewSurface*/null, NUM_REPROCESS_CAPTURES);
+
+ // Test two cases: submitting reprocess requests one by one and in a burst.
+ boolean submitInBursts[] = {false, true};
+ for (boolean submitInBurst : submitInBursts) {
+ // Prepare reprocess capture requests.
+ ArrayList<CaptureRequest> reprocessRequests =
+ new ArrayList<>(NUM_REPROCESS_CAPTURES);
+
+ for (int i = 0; i < NUM_REPROCESS_CAPTURES; i++) {
+ TotalCaptureResult result = submitCaptureRequest(mFirstImageReader.getSurface(),
+ /*inputResult*/null);
+
+ mImageWriter.queueInputImage(
+ mFirstImageReaderListener.getImage(CAPTURE_TIMEOUT_MS));
+ CaptureRequest.Builder builder = mCamera.createReprocessCaptureRequest(result);
+ builder.addTarget(getReprocessOutputImageReader().getSurface());
+ reprocessRequests.add(builder.build());
+ }
+
+ SimpleCaptureCallback captureCallback = new SimpleCaptureCallback();
+
+ // Submit reprocess capture requests.
+ if (submitInBurst) {
+ mSession.captureBurst(reprocessRequests, captureCallback, mHandler);
+ } else {
+ for (CaptureRequest request : reprocessRequests) {
+ mSession.capture(request, captureCallback, mHandler);
+ }
+ }
+
+ // Abort after getting the first result
+ TotalCaptureResult reprocessResult =
+ captureCallback.getTotalCaptureResultForRequest(reprocessRequests.get(0),
+ CAPTURE_TIMEOUT_FRAMES);
+ mSession.abortCaptures();
+
+ // Wait until the session is ready again.
+ mSessionListener.getStateWaiter().waitForState(
+ BlockingSessionCallback.SESSION_READY, SESSION_CLOSE_TIMEOUT_MS);
+
+ // Gather all failed requests.
+ ArrayList<CaptureFailure> failures =
+ captureCallback.getCaptureFailures(NUM_REPROCESS_CAPTURES - 1);
+ ArrayList<CaptureRequest> failedRequests = new ArrayList<>();
+ for (CaptureFailure failure : failures) {
+ failedRequests.add(failure.getRequest());
+ }
+
+ // For each request that didn't fail must have a valid result.
+ for (int i = 1; i < reprocessRequests.size(); i++) {
+ CaptureRequest request = reprocessRequests.get(i);
+ if (!failedRequests.contains(request)) {
+ captureCallback.getTotalCaptureResultForRequest(request,
+ CAPTURE_TIMEOUT_FRAMES);
+ }
+ }
+
+ // Drain the image reader listeners.
+ mFirstImageReaderListener.drain();
+ if (!mShareOneImageReader) {
+ mSecondImageReaderListener.drain();
+ }
+
+ // Make sure all input surfaces are released.
+ for (int i = 0; i < NUM_REPROCESS_CAPTURES; i++) {
+ mImageWriterListener.waitForImageReleased(CAPTURE_TIMEOUT_MS);
+ }
+ }
+ } finally {
+ closeReprossibleSession();
+ closeImageReaders();
+ }
+ }
+
+ /**
+ * Test timestamps for reprocess requests. Reprocess request's shutter timestamp, result's
+ * sensor timestamp, and output image's timestamp should match the reprocess input's timestamp.
+ */
+ private void testReprocessTimestamps(String cameraId, Size inputSize, int inputFormat,
+ Size reprocessOutputSize, int reprocessOutputFormat) throws Exception {
+ if (VERBOSE) {
+ Log.v(TAG, "testReprocessTimestamps: cameraId: " + cameraId + " inputSize: " +
+ inputSize + " inputFormat: " + inputFormat + " reprocessOutputSize: " +
+ reprocessOutputSize + " reprocessOutputFormat: " + reprocessOutputFormat);
+ }
+
+ try {
+ setupImageReaders(inputSize, inputFormat, reprocessOutputSize, reprocessOutputFormat,
+ NUM_REPROCESS_CAPTURES);
+ setupReprocessableSession(/*previewSurface*/null, NUM_REPROCESS_CAPTURES);
+
+ // Prepare reprocess capture requests.
+ ArrayList<CaptureRequest> reprocessRequests = new ArrayList<>(NUM_REPROCESS_CAPTURES);
+ ArrayList<Long> expectedTimestamps = new ArrayList<>(NUM_REPROCESS_CAPTURES);
+
+ for (int i = 0; i < NUM_REPROCESS_CAPTURES; i++) {
+ TotalCaptureResult result = submitCaptureRequest(mFirstImageReader.getSurface(),
+ /*inputResult*/null);
+
+ mImageWriter.queueInputImage(
+ mFirstImageReaderListener.getImage(CAPTURE_TIMEOUT_MS));
+ CaptureRequest.Builder builder = mCamera.createReprocessCaptureRequest(result);
+ builder.addTarget(getReprocessOutputImageReader().getSurface());
+ reprocessRequests.add(builder.build());
+ // Reprocess result's timestamp should match input image's timestamp.
+ expectedTimestamps.add(result.get(CaptureResult.SENSOR_TIMESTAMP));
+ }
+
+ // Submit reprocess requests.
+ SimpleCaptureCallback captureCallback = new SimpleCaptureCallback();
+ mSession.captureBurst(reprocessRequests, captureCallback, mHandler);
+
+ // Verify we get the expected timestamps.
+ for (int i = 0; i < reprocessRequests.size(); i++) {
+ captureCallback.waitForCaptureStart(reprocessRequests.get(i),
+ expectedTimestamps.get(i), CAPTURE_TIMEOUT_FRAMES);
+ }
+
+ TotalCaptureResult[] reprocessResults =
+ captureCallback.getTotalCaptureResultsForRequests(reprocessRequests,
+ CAPTURE_TIMEOUT_FRAMES);
+
+ for (int i = 0; i < expectedTimestamps.size(); i++) {
+ // Verify the result timestamps match the input image's timestamps.
+ long expected = expectedTimestamps.get(i);
+ long timestamp = reprocessResults[i].get(CaptureResult.SENSOR_TIMESTAMP);
+ assertEquals("Reprocess result timestamp (" + timestamp + ") doesn't match input " +
+ "image's timestamp (" + expected + ")", expected, timestamp);
+
+ // Verify the reprocess output image timestamps match the input image's timestamps.
+ Image image = getReprocessOutputImageReaderListener().getImage(CAPTURE_TIMEOUT_MS);
+ timestamp = image.getTimestamp();
+ image.close();
+
+ assertEquals("Reprocess output timestamp (" + timestamp + ") doesn't match input " +
+ "image's timestamp (" + expected + ")", expected, timestamp);
+ }
+
+ // Make sure all input surfaces are released.
+ for (int i = 0; i < NUM_REPROCESS_CAPTURES; i++) {
+ mImageWriterListener.waitForImageReleased(CAPTURE_TIMEOUT_MS);
+ }
+ } finally {
+ closeReprossibleSession();
+ closeImageReaders();
+ }
+ }
+
+ /**
+ * Test JPEG tags for reprocess requests. Reprocess result's JPEG tags and JPEG image's tags
+ * match reprocess request's JPEG tags.
+ */
+ private void testReprocessJpegExif(String cameraId, Size inputSize, int inputFormat,
+ Size reprocessOutputSize) throws Exception {
+ if (VERBOSE) {
+ Log.v(TAG, "testReprocessJpegExif: cameraId: " + cameraId + " inputSize: " +
+ inputSize + " inputFormat: " + inputFormat + " reprocessOutputSize: " +
+ reprocessOutputSize);
+ }
+
+ Size[] thumbnailSizes = mStaticInfo.getAvailableThumbnailSizesChecked();
+ Size[] testThumbnailSizes = new Size[EXIF_TEST_DATA.length];
+ Arrays.fill(testThumbnailSizes, thumbnailSizes[thumbnailSizes.length - 1]);
+ // Make sure thumbnail size (0, 0) is covered.
+ testThumbnailSizes[0] = new Size(0, 0);
+
+ try {
+ setupImageReaders(inputSize, inputFormat, reprocessOutputSize, ImageFormat.JPEG,
+ EXIF_TEST_DATA.length);
+ setupReprocessableSession(/*previewSurface*/null, EXIF_TEST_DATA.length);
+
+ // Prepare reprocess capture requests.
+ ArrayList<CaptureRequest> reprocessRequests = new ArrayList<>(EXIF_TEST_DATA.length);
+
+ for (int i = 0; i < EXIF_TEST_DATA.length; i++) {
+ TotalCaptureResult result = submitCaptureRequest(mFirstImageReader.getSurface(),
+ /*inputResult*/null);
+ mImageWriter.queueInputImage(
+ mFirstImageReaderListener.getImage(CAPTURE_TIMEOUT_MS));
+
+ CaptureRequest.Builder builder = mCamera.createReprocessCaptureRequest(result);
+ builder.addTarget(getReprocessOutputImageReader().getSurface());
+
+ // set jpeg keys
+ setJpegKeys(builder, EXIF_TEST_DATA[i], testThumbnailSizes[i], mCollector);
+ reprocessRequests.add(builder.build());
+ }
+
+ // Submit reprocess requests.
+ SimpleCaptureCallback captureCallback = new SimpleCaptureCallback();
+ mSession.captureBurst(reprocessRequests, captureCallback, mHandler);
+
+ TotalCaptureResult[] reprocessResults =
+ captureCallback.getTotalCaptureResultsForRequests(reprocessRequests,
+ CAPTURE_TIMEOUT_FRAMES);
+
+ for (int i = 0; i < EXIF_TEST_DATA.length; i++) {
+ // Verify output image's and result's JPEG EXIF data.
+ Image image = getReprocessOutputImageReaderListener().getImage(CAPTURE_TIMEOUT_MS);
+ verifyJpegKeys(image, reprocessResults[i], reprocessOutputSize,
+ testThumbnailSizes[i], EXIF_TEST_DATA[i], mStaticInfo, mCollector);
+ image.close();
+
+ }
+ } finally {
+ closeReprossibleSession();
+ closeImageReaders();
+ }
+ }
+
+
+
+ /**
+ * Test the following keys in reprocess results match the keys in reprocess requests:
+ * 1. EDGE_MODE
+ * 2. NOISE_REDUCTION_MODE
+ * 3. REPROCESS_EFFECTIVE_EXPOSURE_FACTOR (only for YUV reprocess)
+ */
+ private void testReprocessRequestKeys(String cameraId, Size inputSize, int inputFormat,
+ Size reprocessOutputSize, int reprocessOutputFormat) throws Exception {
+ if (VERBOSE) {
+ Log.v(TAG, "testReprocessRequestKeys: cameraId: " + cameraId + " inputSize: " +
+ inputSize + " inputFormat: " + inputFormat + " reprocessOutputSize: " +
+ reprocessOutputSize + " reprocessOutputFormat: " + reprocessOutputFormat);
+ }
+
+ final Integer[] EDGE_MODES = {CaptureRequest.EDGE_MODE_FAST,
+ CaptureRequest.EDGE_MODE_HIGH_QUALITY, CaptureRequest.EDGE_MODE_OFF,
+ CaptureRequest.EDGE_MODE_ZERO_SHUTTER_LAG};
+ final Integer[] NR_MODES = {CaptureRequest.NOISE_REDUCTION_MODE_HIGH_QUALITY,
+ CaptureRequest.NOISE_REDUCTION_MODE_OFF,
+ CaptureRequest.NOISE_REDUCTION_MODE_ZERO_SHUTTER_LAG,
+ CaptureRequest.NOISE_REDUCTION_MODE_FAST};
+ final Float[] EFFECTIVE_EXP_FACTORS = {null, 1.0f, 2.5f, 4.0f};
+ int numFrames = EDGE_MODES.length;
+
+ try {
+ setupImageReaders(inputSize, inputFormat, reprocessOutputSize, reprocessOutputFormat,
+ numFrames);
+ setupReprocessableSession(/*previewSurface*/null, numFrames);
+
+ // Prepare reprocess capture requests.
+ ArrayList<CaptureRequest> reprocessRequests = new ArrayList<>(numFrames);
+
+ for (int i = 0; i < numFrames; i++) {
+ TotalCaptureResult result = submitCaptureRequest(mFirstImageReader.getSurface(),
+ /*inputResult*/null);
+ mImageWriter.queueInputImage(
+ mFirstImageReaderListener.getImage(CAPTURE_TIMEOUT_MS));
+
+ CaptureRequest.Builder builder = mCamera.createReprocessCaptureRequest(result);
+ builder.addTarget(getReprocessOutputImageReader().getSurface());
+
+ // Set reprocess request keys
+ builder.set(CaptureRequest.EDGE_MODE, EDGE_MODES[i]);
+ builder.set(CaptureRequest.NOISE_REDUCTION_MODE, NR_MODES[i]);
+ if (inputFormat == ImageFormat.YUV_420_888) {
+ builder.set(CaptureRequest.REPROCESS_EFFECTIVE_EXPOSURE_FACTOR,
+ EFFECTIVE_EXP_FACTORS[i]);
+ }
+ reprocessRequests.add(builder.build());
+ }
+
+ // Submit reprocess requests.
+ SimpleCaptureCallback captureCallback = new SimpleCaptureCallback();
+ mSession.captureBurst(reprocessRequests, captureCallback, mHandler);
+
+ TotalCaptureResult[] reprocessResults =
+ captureCallback.getTotalCaptureResultsForRequests(reprocessRequests,
+ CAPTURE_TIMEOUT_FRAMES);
+
+ for (int i = 0; i < numFrames; i++) {
+ // Verify result's keys
+ Integer resultEdgeMode = reprocessResults[i].get(CaptureResult.EDGE_MODE);
+ Integer resultNoiseReductionMode =
+ reprocessResults[i].get(CaptureResult.NOISE_REDUCTION_MODE);
+
+ assertEquals("Reprocess result edge mode (" + resultEdgeMode +
+ ") doesn't match requested edge mode (" + EDGE_MODES[i] + ")",
+ resultEdgeMode, EDGE_MODES[i]);
+ assertEquals("Reprocess result noise reduction mode (" + resultNoiseReductionMode +
+ ") doesn't match requested noise reduction mode (" +
+ NR_MODES[i] + ")", resultNoiseReductionMode,
+ NR_MODES[i]);
+
+ if (inputFormat == ImageFormat.YUV_420_888) {
+ Float resultEffectiveExposureFactor = reprocessResults[i].get(
+ CaptureResult.REPROCESS_EFFECTIVE_EXPOSURE_FACTOR);
+ assertEquals("Reprocess effective exposure factor (" +
+ resultEffectiveExposureFactor + ") doesn't match requested " +
+ "effective exposure factor (" + EFFECTIVE_EXP_FACTORS[i] + ")",
+ resultEffectiveExposureFactor, EFFECTIVE_EXP_FACTORS[i]);
+ }
+ }
+ } finally {
+ closeReprossibleSession();
+ closeImageReaders();
+ }
+ }
+
+ /**
+ * Set up two image readers: one for regular capture (used for reprocess input) and one for
+ * reprocess capture.
+ */
+ private void setupImageReaders(Size inputSize, int inputFormat, Size reprocessOutputSize,
+ int reprocessOutputFormat, int maxImages) {
+
+ mShareOneImageReader = false;
+ // If the regular output and reprocess output have the same size and format,
+ // they can share one image reader.
+ if (inputFormat == reprocessOutputFormat &&
+ inputSize.equals(reprocessOutputSize)) {
+ maxImages *= 2;
+ mShareOneImageReader = true;
+ }
+ // create an ImageReader for the regular capture
+ mFirstImageReaderListener = new SimpleImageReaderListener();
+ mFirstImageReader = makeImageReader(inputSize, inputFormat, maxImages,
+ mFirstImageReaderListener, mHandler);
+
+ if (!mShareOneImageReader) {
+ // create an ImageReader for the reprocess capture
+ mSecondImageReaderListener = new SimpleImageReaderListener();
+ mSecondImageReader = makeImageReader(reprocessOutputSize, reprocessOutputFormat,
+ maxImages, mSecondImageReaderListener, mHandler);
+ }
+ }
+
+ /**
+ * Close two image readers.
+ */
+ private void closeImageReaders() {
+ CameraTestUtils.closeImageReader(mFirstImageReader);
+ mFirstImageReader = null;
+ CameraTestUtils.closeImageReader(mSecondImageReader);
+ mSecondImageReader = null;
+ }
+
+ /**
+ * Get the ImageReader for reprocess output.
+ */
+ private ImageReader getReprocessOutputImageReader() {
+ if (mShareOneImageReader) {
+ return mFirstImageReader;
+ } else {
+ return mSecondImageReader;
+ }
+ }
+
+ private SimpleImageReaderListener getReprocessOutputImageReaderListener() {
+ if (mShareOneImageReader) {
+ return mFirstImageReaderListener;
+ } else {
+ return mSecondImageReaderListener;
+ }
+ }
+
+ /**
+ * Set up a reprocessable session and create an ImageWriter with the sessoin's input surface.
+ */
+ private void setupReprocessableSession(Surface previewSurface, int numImageWriterImages)
+ throws Exception {
+ // create a reprocessable capture session
+ List<Surface> outSurfaces = new ArrayList<Surface>();
+ outSurfaces.add(mFirstImageReader.getSurface());
+ if (!mShareOneImageReader) {
+ outSurfaces.add(mSecondImageReader.getSurface());
+ }
+ if (previewSurface != null) {
+ outSurfaces.add(previewSurface);
+ }
+
+ InputConfiguration inputConfig = new InputConfiguration(mFirstImageReader.getWidth(),
+ mFirstImageReader.getHeight(), mFirstImageReader.getImageFormat());
+ String inputConfigString = inputConfig.toString();
+ if (VERBOSE) {
+ Log.v(TAG, "InputConfiguration: " + inputConfigString);
+ }
+ assertTrue(String.format("inputConfig is wrong: %dx%d format %d. Expect %dx%d format %d",
+ inputConfig.getWidth(), inputConfig.getHeight(), inputConfig.getFormat(),
+ mFirstImageReader.getWidth(), mFirstImageReader.getHeight(),
+ mFirstImageReader.getImageFormat()),
+ inputConfig.getWidth() == mFirstImageReader.getWidth() &&
+ inputConfig.getHeight() == mFirstImageReader.getHeight() &&
+ inputConfig.getFormat() == mFirstImageReader.getImageFormat());
+
+ mSessionListener = new BlockingSessionCallback();
+ mSession = configureReprocessableCameraSession(mCamera, inputConfig, outSurfaces,
+ mSessionListener, mHandler);
+
+ // create an ImageWriter
+ mInputSurface = mSession.getInputSurface();
+ mImageWriter = ImageWriter.newInstance(mInputSurface,
+ numImageWriterImages);
+
+ mImageWriterListener = new SimpleImageWriterListener(mImageWriter);
+ mImageWriter.setOnImageReleasedListener(mImageWriterListener, mHandler);
+ }
+
+ /**
+ * Close the reprocessable session and ImageWriter.
+ */
+ private void closeReprossibleSession() {
+ mInputSurface = null;
+
+ if (mSession != null) {
+ mSession.close();
+ mSession = null;
+ }
+
+ if (mImageWriter != null) {
+ mImageWriter.close();
+ mImageWriter = null;
+ }
+ }
+
+ /**
+ * Do one reprocess capture.
+ */
+ private ImageResultHolder doReprocessCapture() throws Exception {
+ return doReprocessBurstCapture(/*numBurst*/1)[0];
+ }
+
+ /**
+ * Do a burst of reprocess captures.
+ */
+ private ImageResultHolder[] doReprocessBurstCapture(int numBurst) throws Exception {
+ boolean[] isReprocessCaptures = new boolean[numBurst];
+ for (int i = 0; i < numBurst; i++) {
+ isReprocessCaptures[i] = true;
+ }
+
+ return doMixedReprocessBurstCapture(isReprocessCaptures);
+ }
+
+ /**
+ * Do a burst of captures that are mixed with regular and reprocess captures.
+ *
+ * @param isReprocessCaptures An array whose elements indicate whether it's a reprocess capture
+ * request. If the element is true, it represents a reprocess capture
+ * request. If the element is false, it represents a regular capture
+ * request. The size of the array is the number of capture requests
+ * in the burst.
+ */
+ private ImageResultHolder[] doMixedReprocessBurstCapture(boolean[] isReprocessCaptures)
+ throws Exception {
+ if (isReprocessCaptures == null || isReprocessCaptures.length <= 0) {
+ throw new IllegalArgumentException("isReprocessCaptures must have at least 1 capture.");
+ }
+
+ boolean hasReprocessRequest = false;
+ boolean hasRegularRequest = false;
+
+ TotalCaptureResult[] results = new TotalCaptureResult[isReprocessCaptures.length];
+ for (int i = 0; i < isReprocessCaptures.length; i++) {
+ // submit a capture and get the result if this entry is a reprocess capture.
+ if (isReprocessCaptures[i]) {
+ results[i] = submitCaptureRequest(mFirstImageReader.getSurface(),
+ /*inputResult*/null);
+ mImageWriter.queueInputImage(
+ mFirstImageReaderListener.getImage(CAPTURE_TIMEOUT_MS));
+ hasReprocessRequest = true;
+ } else {
+ hasRegularRequest = true;
+ }
+ }
+
+ Surface[] outputSurfaces = new Surface[isReprocessCaptures.length];
+ for (int i = 0; i < isReprocessCaptures.length; i++) {
+ outputSurfaces[i] = getReprocessOutputImageReader().getSurface();
+ }
+
+ TotalCaptureResult[] finalResults = submitMixedCaptureBurstRequest(outputSurfaces, results);
+
+ ImageResultHolder[] holders = new ImageResultHolder[isReprocessCaptures.length];
+ for (int i = 0; i < isReprocessCaptures.length; i++) {
+ Image image = getReprocessOutputImageReaderListener().getImage(CAPTURE_TIMEOUT_MS);
+ if (hasReprocessRequest && hasRegularRequest) {
+ // If there are mixed requests, images and results may not be in the same order.
+ for (int j = 0; j < finalResults.length; j++) {
+ if (finalResults[j] != null &&
+ finalResults[j].get(CaptureResult.SENSOR_TIMESTAMP) ==
+ image.getTimestamp()) {
+ holders[i] = new ImageResultHolder(image, finalResults[j]);
+ finalResults[j] = null;
+ break;
+ }
+ }
+
+ assertNotNull("Cannot find a result matching output image's timestamp: " +
+ image.getTimestamp(), holders[i]);
+ } else {
+ // If no mixed requests, images and results should be in the same order.
+ holders[i] = new ImageResultHolder(image, finalResults[i]);
+ }
+ }
+
+ return holders;
+ }
+
+ /**
+ * Start preview without a listener.
+ */
+ private void startPreview(Surface previewSurface) throws Exception {
+ CaptureRequest.Builder builder = mCamera.createCaptureRequest(ZSL_TEMPLATE);
+ builder.addTarget(previewSurface);
+ mSession.setRepeatingRequest(builder.build(), null, mHandler);
+ }
+
+ /**
+ * Issue a capture request and return the result. If inputResult is null, it's a regular
+ * request. Otherwise, it's a reprocess request.
+ */
+ private TotalCaptureResult submitCaptureRequest(Surface output,
+ TotalCaptureResult inputResult) throws Exception {
+ Surface[] outputs = new Surface[1];
+ outputs[0] = output;
+ TotalCaptureResult[] inputResults = new TotalCaptureResult[1];
+ inputResults[0] = inputResult;
+
+ return submitMixedCaptureBurstRequest(outputs, inputResults)[0];
+ }
+
+ /**
+ * Submit a burst request mixed with regular and reprocess requests.
+ *
+ * @param outputs An array of output surfaces. One output surface will be used in one request
+ * so the length of the array is the number of requests in a burst request.
+ * @param inputResults An array of input results. If it's null, all requests are regular
+ * requests. If an element is null, that element represents a regular
+ * request. If an element if not null, that element represents a reprocess
+ * request.
+ *
+ */
+ private TotalCaptureResult[] submitMixedCaptureBurstRequest(Surface[] outputs,
+ TotalCaptureResult[] inputResults) throws Exception {
+ if (outputs == null || outputs.length <= 0) {
+ throw new IllegalArgumentException("outputs must have at least 1 surface");
+ } else if (inputResults != null && inputResults.length != outputs.length) {
+ throw new IllegalArgumentException("The lengths of outputs and inputResults " +
+ "don't match");
+ }
+
+ int numReprocessCaptures = 0;
+ SimpleCaptureCallback captureCallback = new SimpleCaptureCallback();
+ ArrayList<CaptureRequest> captureRequests = new ArrayList<>(outputs.length);
+
+ // Prepare a list of capture requests. Whether it's a regular or reprocess capture request
+ // is based on inputResults array.
+ for (int i = 0; i < outputs.length; i++) {
+ CaptureRequest.Builder builder;
+ boolean isReprocess = (inputResults != null && inputResults[i] != null);
+ if (isReprocess) {
+ builder = mCamera.createReprocessCaptureRequest(inputResults[i]);
+ numReprocessCaptures++;
+ } else {
+ builder = mCamera.createCaptureRequest(CAPTURE_TEMPLATE);
+ }
+ builder.addTarget(outputs[i]);
+ CaptureRequest request = builder.build();
+ assertTrue("Capture request reprocess type " + request.isReprocess() + " is wrong.",
+ request.isReprocess() == isReprocess);
+
+ captureRequests.add(request);
+ }
+
+ if (captureRequests.size() == 1) {
+ mSession.capture(captureRequests.get(0), captureCallback, mHandler);
+ } else {
+ mSession.captureBurst(captureRequests, captureCallback, mHandler);
+ }
+
+ TotalCaptureResult[] results;
+ if (numReprocessCaptures == 0 || numReprocessCaptures == outputs.length) {
+ results = new TotalCaptureResult[outputs.length];
+ // If the requests are not mixed, they should come in order.
+ for (int i = 0; i < results.length; i++){
+ results[i] = captureCallback.getTotalCaptureResultForRequest(
+ captureRequests.get(i), CAPTURE_TIMEOUT_FRAMES);
+ }
+ } else {
+ // If the requests are mixed, they may not come in order.
+ results = captureCallback.getTotalCaptureResultsForRequests(
+ captureRequests, CAPTURE_TIMEOUT_FRAMES * captureRequests.size());
+ }
+
+ // make sure all input surfaces are released.
+ for (int i = 0; i < numReprocessCaptures; i++) {
+ mImageWriterListener.waitForImageReleased(CAPTURE_TIMEOUT_MS);
+ }
+
+ return results;
+ }
+
+ private Size getMaxSize(int format, StaticMetadata.StreamDirection direction) {
+ Size[] sizes = mStaticInfo.getAvailableSizesForFormatChecked(format, direction);
+ return getAscendingOrderSizes(Arrays.asList(sizes), /*ascending*/false).get(0);
+ }
+
+ private boolean isYuvReprocessSupported(String cameraId) throws Exception {
+ return isReprocessSupported(cameraId, ImageFormat.YUV_420_888);
+ }
+
+ private boolean isOpaqueReprocessSupported(String cameraId) throws Exception {
+ return isReprocessSupported(cameraId, ImageFormat.PRIVATE);
+ }
+
+ private void dumpImage(Image image, String name) {
+ String filename = DEBUG_FILE_NAME_BASE + name;
+ switch(image.getFormat()) {
+ case ImageFormat.JPEG:
+ filename += ".jpg";
+ break;
+ case ImageFormat.NV16:
+ case ImageFormat.NV21:
+ case ImageFormat.YUV_420_888:
+ filename += ".yuv";
+ break;
+ default:
+ filename += "." + image.getFormat();
+ break;
+ }
+
+ Log.d(TAG, "dumping an image to " + filename);
+ dumpFile(filename , getDataFromImage(image));
+ }
+
+ /**
+ * A class that holds an Image and a TotalCaptureResult.
+ */
+ private static class ImageResultHolder {
+ private final Image mImage;
+ private final TotalCaptureResult mResult;
+
+ public ImageResultHolder(Image image, TotalCaptureResult result) {
+ mImage = image;
+ mResult = result;
+ }
+
+ public Image getImage() {
+ return mImage;
+ }
+
+ public TotalCaptureResult getTotalCaptureResult() {
+ return mResult;
+ }
+ }
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2StillCaptureTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2StillCaptureTest.java
new file mode 100644
index 0000000..16dfb2b
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2StillCaptureTest.java
@@ -0,0 +1,628 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mediaframeworktest.stress;
+
+import com.android.ex.camera2.blocking.BlockingSessionCallback;
+import com.android.ex.camera2.exceptions.TimeoutRuntimeException;
+import com.android.mediaframeworktest.Camera2SurfaceViewTestCase;
+import com.android.mediaframeworktest.helpers.Camera2Focuser;
+import com.android.mediaframeworktest.helpers.CameraTestUtils;
+import com.android.mediaframeworktest.helpers.CameraTestUtils.SimpleCaptureCallback;
+
+import android.graphics.ImageFormat;
+import android.graphics.Point;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.hardware.camera2.DngCreator;
+import android.hardware.camera2.params.MeteringRectangle;
+import android.media.Image;
+import android.media.ImageReader;
+import android.os.ConditionVariable;
+import android.util.Log;
+import android.util.Pair;
+import android.util.Rational;
+import android.util.Size;
+import android.view.Surface;
+
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.CAPTURE_IMAGE_TIMEOUT_MS;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.MAX_READER_IMAGES;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.SimpleImageReaderListener;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.basicValidateJpegImage;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.configureCameraSession;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.dumpFile;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.getDataFromImage;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.getValueNotNull;
+import static com.android.mediaframeworktest.helpers.CameraTestUtils.makeImageReader;
+
+/**
+ * <p>Tests for still capture API.</p>
+ *
+ * adb shell am instrument \
+ * -e class com.android.mediaframeworktest.stress.Camera2StillCaptureTest#testTakePicture \
+ * -e repeat 200 \
+ * -e waitIntervalMs 1000 \
+ * -e resultToFile false \
+ * -r -w com.android.mediaframeworktest/.Camera2InstrumentationTestRunner
+ */
+public class Camera2StillCaptureTest extends Camera2SurfaceViewTestCase {
+ private static final String TAG = "StillCaptureTest";
+ private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
+ private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+ // 60 second to accommodate the possible long exposure time.
+ private static final int MAX_REGIONS_AE_INDEX = 0;
+ private static final int MAX_REGIONS_AWB_INDEX = 1;
+ private static final int MAX_REGIONS_AF_INDEX = 2;
+ private static final int WAIT_FOR_FOCUS_DONE_TIMEOUT_MS = 6000;
+ private static final double AE_COMPENSATION_ERROR_TOLERANCE = 0.2;
+ // 5 percent error margin for resulting metering regions
+ private static final float METERING_REGION_ERROR_PERCENT_DELTA = 0.05f;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ /**
+ * Test normal still capture sequence.
+ * <p>
+ * Preview and and jpeg output streams are configured. Max still capture
+ * size is used for jpeg capture. The sequence of still capture being test
+ * is: start preview, auto focus, precapture metering (if AE is not
+ * converged), then capture jpeg. The AWB and AE are in auto modes. AF mode
+ * is CONTINUOUS_PICTURE.
+ * </p>
+ */
+ public void testTakePicture() throws Exception{
+ for (String id : mCameraIds) {
+ try {
+ Log.i(TAG, "Testing basic take picture for Camera " + id);
+ openDevice(id);
+ if (!mStaticInfo.isColorOutputSupported()) {
+ Log.i(TAG, "Camera " + id + " does not support color outputs, skipping");
+ continue;
+ }
+
+ // Test iteration starts...
+ for (int repeat = 0; repeat < getRepeatCount(); ++repeat) {
+ Log.v(TAG, String.format("Taking pictures: %d/%d", repeat + 1,
+ getRepeatCount()));
+ takePictureTestByCamera(/*aeRegions*/null, /*awbRegions*/null,
+ /*afRegions*/null);
+ getResultPrinter().printStatus(getRepeatCount(), repeat + 1, id);
+ Thread.sleep(getTestWaitIntervalMs());
+ }
+ } finally {
+ closeDevice();
+ closeImageReader();
+ }
+ }
+ }
+
+ /**
+ * Test the full raw capture use case.
+ *
+ * This includes:
+ * - Configuring the camera with a preview, jpeg, and raw output stream.
+ * - Running preview until AE/AF can settle.
+ * - Capturing with a request targeting all three output streams.
+ */
+ public void testFullRawCapture() throws Exception {
+ for (int i = 0; i < mCameraIds.length; i++) {
+ try {
+ Log.i(TAG, "Testing raw capture for Camera " + mCameraIds[i]);
+ openDevice(mCameraIds[i]);
+ if (!mStaticInfo.isCapabilitySupported(
+ CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_RAW)) {
+ Log.i(TAG, "RAW capability is not supported in camera " + mCameraIds[i] +
+ ". Skip the test.");
+ continue;
+ }
+
+ // Test iteration starts...
+ for (int repeat = 0; repeat < getRepeatCount(); ++repeat) {
+ Log.v(TAG, String.format("Taking full RAW pictures: %d/%d", repeat + 1,
+ getRepeatCount()));
+ fullRawCaptureTestByCamera();
+ getResultPrinter().printStatus(getRepeatCount(), repeat + 1, mCameraIds[i]);
+ Thread.sleep(getTestWaitIntervalMs());
+ }
+ } finally {
+ closeDevice();
+ closeImageReader();
+ }
+ }
+ }
+
+ /**
+ * Take a picture for a given set of 3A regions for a particular camera.
+ * <p>
+ * Before take a still capture, it triggers an auto focus and lock it first,
+ * then wait for AWB to converge and lock it, then trigger a precapture
+ * metering sequence and wait for AE converged. After capture is received, the
+ * capture result and image are validated.
+ * </p>
+ *
+ * @param aeRegions AE regions for this capture
+ * @param awbRegions AWB regions for this capture
+ * @param afRegions AF regions for this capture
+ */
+ private void takePictureTestByCamera(
+ MeteringRectangle[] aeRegions, MeteringRectangle[] awbRegions,
+ MeteringRectangle[] afRegions) throws Exception {
+ takePictureTestByCamera(aeRegions, awbRegions, afRegions,
+ /*addAeTriggerCancel*/false);
+ }
+
+ /**
+ * Take a picture for a given set of 3A regions for a particular camera.
+ * <p>
+ * Before take a still capture, it triggers an auto focus and lock it first,
+ * then wait for AWB to converge and lock it, then trigger a precapture
+ * metering sequence and wait for AE converged. After capture is received, the
+ * capture result and image are validated. If {@code addAeTriggerCancel} is true,
+ * a precapture trigger cancel will be inserted between two adjacent triggers, which
+ * should effective cancel the first trigger.
+ * </p>
+ *
+ * @param aeRegions AE regions for this capture
+ * @param awbRegions AWB regions for this capture
+ * @param afRegions AF regions for this capture
+ * @param addAeTriggerCancel If a AE precapture trigger cancel is sent after the trigger.
+ */
+ private void takePictureTestByCamera(
+ MeteringRectangle[] aeRegions, MeteringRectangle[] awbRegions,
+ MeteringRectangle[] afRegions, boolean addAeTriggerCancel) throws Exception {
+
+ boolean hasFocuser = mStaticInfo.hasFocuser();
+
+ Size maxStillSz = mOrderedStillSizes.get(0);
+ Size maxPreviewSz = mOrderedPreviewSizes.get(0);
+ CaptureResult result;
+ SimpleCaptureCallback resultListener = new SimpleCaptureCallback();
+ SimpleImageReaderListener imageListener = new SimpleImageReaderListener();
+ CaptureRequest.Builder previewRequest =
+ mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+ CaptureRequest.Builder stillRequest =
+ mCamera.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
+ prepareStillCaptureAndStartPreview(previewRequest, stillRequest, maxPreviewSz,
+ maxStillSz, resultListener, imageListener);
+
+ // Set AE mode to ON_AUTO_FLASH if flash is available.
+ if (mStaticInfo.hasFlash()) {
+ previewRequest.set(CaptureRequest.CONTROL_AE_MODE,
+ CaptureRequest.CONTROL_AE_MODE_ON_AUTO_FLASH);
+ stillRequest.set(CaptureRequest.CONTROL_AE_MODE,
+ CaptureRequest.CONTROL_AE_MODE_ON_AUTO_FLASH);
+ }
+
+ Camera2Focuser focuser = null;
+ /**
+ * Step 1: trigger an auto focus run, and wait for AF locked.
+ */
+ boolean canSetAfRegion = hasFocuser && (afRegions != null) &&
+ isRegionsSupportedFor3A(MAX_REGIONS_AF_INDEX);
+ if (hasFocuser) {
+ SimpleAutoFocusListener afListener = new SimpleAutoFocusListener();
+ focuser = new Camera2Focuser(mCamera, mSession, mPreviewSurface, afListener,
+ mStaticInfo.getCharacteristics(), mHandler);
+ if (canSetAfRegion) {
+ stillRequest.set(CaptureRequest.CONTROL_AF_REGIONS, afRegions);
+ }
+ focuser.startAutoFocus(afRegions);
+ afListener.waitForAutoFocusDone(WAIT_FOR_FOCUS_DONE_TIMEOUT_MS);
+ }
+
+ /**
+ * Have to get the current AF mode to be used for other 3A repeating
+ * request, otherwise, the new AF mode in AE/AWB request could be
+ * different with existing repeating requests being sent by focuser,
+ * then it could make AF unlocked too early. Beside that, for still
+ * capture, AF mode must not be different with the one in current
+ * repeating request, otherwise, the still capture itself would trigger
+ * an AF mode change, and the AF lock would be lost for this capture.
+ */
+ int currentAfMode = CaptureRequest.CONTROL_AF_MODE_OFF;
+ if (hasFocuser) {
+ currentAfMode = focuser.getCurrentAfMode();
+ }
+ previewRequest.set(CaptureRequest.CONTROL_AF_MODE, currentAfMode);
+ stillRequest.set(CaptureRequest.CONTROL_AF_MODE, currentAfMode);
+
+ /**
+ * Step 2: AF is already locked, wait for AWB converged, then lock it.
+ */
+ resultListener = new SimpleCaptureCallback();
+ boolean canSetAwbRegion =
+ (awbRegions != null) && isRegionsSupportedFor3A(MAX_REGIONS_AWB_INDEX);
+ if (canSetAwbRegion) {
+ previewRequest.set(CaptureRequest.CONTROL_AWB_REGIONS, awbRegions);
+ stillRequest.set(CaptureRequest.CONTROL_AWB_REGIONS, awbRegions);
+ }
+ mSession.setRepeatingRequest(previewRequest.build(), resultListener, mHandler);
+ if (mStaticInfo.isHardwareLevelLimitedOrBetter()) {
+ waitForResultValue(resultListener, CaptureResult.CONTROL_AWB_STATE,
+ CaptureResult.CONTROL_AWB_STATE_CONVERGED, NUM_RESULTS_WAIT_TIMEOUT);
+ } else {
+ // LEGACY Devices don't have the AWB_STATE reported in results, so just wait
+ waitForSettingsApplied(resultListener, NUM_FRAMES_WAITED_FOR_UNKNOWN_LATENCY);
+ }
+ boolean canSetAwbLock = mStaticInfo.isAwbLockSupported();
+ if (canSetAwbLock) {
+ previewRequest.set(CaptureRequest.CONTROL_AWB_LOCK, true);
+ }
+ mSession.setRepeatingRequest(previewRequest.build(), resultListener, mHandler);
+ // Validate the next result immediately for region and mode.
+ result = resultListener.getCaptureResult(WAIT_FOR_RESULT_TIMEOUT_MS);
+ mCollector.expectEquals("AWB mode in result and request should be same",
+ previewRequest.get(CaptureRequest.CONTROL_AWB_MODE),
+ result.get(CaptureResult.CONTROL_AWB_MODE));
+ if (canSetAwbRegion) {
+ MeteringRectangle[] resultAwbRegions =
+ getValueNotNull(result, CaptureResult.CONTROL_AWB_REGIONS);
+ mCollector.expectEquals("AWB regions in result and request should be same",
+ awbRegions, resultAwbRegions);
+ }
+
+ /**
+ * Step 3: trigger an AE precapture metering sequence and wait for AE converged.
+ */
+ resultListener = new SimpleCaptureCallback();
+ boolean canSetAeRegion =
+ (aeRegions != null) && isRegionsSupportedFor3A(MAX_REGIONS_AE_INDEX);
+ if (canSetAeRegion) {
+ previewRequest.set(CaptureRequest.CONTROL_AE_REGIONS, aeRegions);
+ stillRequest.set(CaptureRequest.CONTROL_AE_REGIONS, aeRegions);
+ }
+ mSession.setRepeatingRequest(previewRequest.build(), resultListener, mHandler);
+ previewRequest.set(CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER,
+ CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER_START);
+ mSession.capture(previewRequest.build(), resultListener, mHandler);
+ if (addAeTriggerCancel) {
+ // Cancel the current precapture trigger, then send another trigger.
+ // The camera device should behave as if the first trigger is not sent.
+ // Wait one request to make the trigger start doing something before cancel.
+ waitForNumResults(resultListener, /*numResultsWait*/ 1);
+ previewRequest.set(CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER,
+ CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER_CANCEL);
+ mSession.capture(previewRequest.build(), resultListener, mHandler);
+ waitForResultValue(resultListener, CaptureResult.CONTROL_AE_PRECAPTURE_TRIGGER,
+ CaptureResult.CONTROL_AE_PRECAPTURE_TRIGGER_CANCEL,
+ NUM_FRAMES_WAITED_FOR_UNKNOWN_LATENCY);
+ // Issue another trigger
+ previewRequest.set(CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER,
+ CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER_START);
+ mSession.capture(previewRequest.build(), resultListener, mHandler);
+ }
+ waitForAeStable(resultListener, NUM_FRAMES_WAITED_FOR_UNKNOWN_LATENCY);
+
+ // Validate the next result immediately for region and mode.
+ result = resultListener.getCaptureResult(WAIT_FOR_RESULT_TIMEOUT_MS);
+ mCollector.expectEquals("AE mode in result and request should be same",
+ previewRequest.get(CaptureRequest.CONTROL_AE_MODE),
+ result.get(CaptureResult.CONTROL_AE_MODE));
+ if (canSetAeRegion) {
+ MeteringRectangle[] resultAeRegions =
+ getValueNotNull(result, CaptureResult.CONTROL_AE_REGIONS);
+
+ mCollector.expectMeteringRegionsAreSimilar(
+ "AE regions in result and request should be similar",
+ aeRegions,
+ resultAeRegions,
+ METERING_REGION_ERROR_PERCENT_DELTA);
+ }
+
+ /**
+ * Step 4: take a picture when all 3A are in good state.
+ */
+ resultListener = new SimpleCaptureCallback();
+ CaptureRequest request = stillRequest.build();
+ mSession.capture(request, resultListener, mHandler);
+ // Validate the next result immediately for region and mode.
+ result = resultListener.getCaptureResultForRequest(request, WAIT_FOR_RESULT_TIMEOUT_MS);
+ mCollector.expectEquals("AF mode in result and request should be same",
+ stillRequest.get(CaptureRequest.CONTROL_AF_MODE),
+ result.get(CaptureResult.CONTROL_AF_MODE));
+ if (canSetAfRegion) {
+ MeteringRectangle[] resultAfRegions =
+ getValueNotNull(result, CaptureResult.CONTROL_AF_REGIONS);
+ mCollector.expectMeteringRegionsAreSimilar(
+ "AF regions in result and request should be similar",
+ afRegions,
+ resultAfRegions,
+ METERING_REGION_ERROR_PERCENT_DELTA);
+ }
+
+ if (hasFocuser) {
+ // Unlock auto focus.
+ focuser.cancelAutoFocus();
+ }
+
+ // validate image
+ Image image = imageListener.getImage(CAPTURE_IMAGE_TIMEOUT_MS);
+ validateJpegCapture(image, maxStillSz);
+
+ // Free image resources
+ image.close();
+
+ stopPreview();
+ }
+
+ private void fullRawCaptureTestByCamera() throws Exception {
+ Size maxPreviewSz = mOrderedPreviewSizes.get(0);
+ Size maxStillSz = mOrderedStillSizes.get(0);
+
+ SimpleCaptureCallback resultListener = new SimpleCaptureCallback();
+ SimpleImageReaderListener jpegListener = new SimpleImageReaderListener();
+ SimpleImageReaderListener rawListener = new SimpleImageReaderListener();
+
+ Size size = mStaticInfo.getRawDimensChecked();
+
+ if (VERBOSE) {
+ Log.v(TAG, "Testing multi capture with size " + size.toString()
+ + ", preview size " + maxPreviewSz);
+ }
+
+ // Prepare raw capture and start preview.
+ CaptureRequest.Builder previewBuilder =
+ mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+ CaptureRequest.Builder multiBuilder =
+ mCamera.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
+
+ ImageReader rawReader = null;
+ ImageReader jpegReader = null;
+
+ try {
+ // Create ImageReaders.
+ rawReader = makeImageReader(size,
+ ImageFormat.RAW_SENSOR, MAX_READER_IMAGES, rawListener, mHandler);
+ jpegReader = makeImageReader(maxStillSz,
+ ImageFormat.JPEG, MAX_READER_IMAGES, jpegListener, mHandler);
+ updatePreviewSurface(maxPreviewSz);
+
+ // Configure output streams with preview and jpeg streams.
+ List<Surface> outputSurfaces = new ArrayList<Surface>();
+ outputSurfaces.add(rawReader.getSurface());
+ outputSurfaces.add(jpegReader.getSurface());
+ outputSurfaces.add(mPreviewSurface);
+ mSessionListener = new BlockingSessionCallback();
+ mSession = configureCameraSession(mCamera, outputSurfaces,
+ mSessionListener, mHandler);
+
+ // Configure the requests.
+ previewBuilder.addTarget(mPreviewSurface);
+ multiBuilder.addTarget(mPreviewSurface);
+ multiBuilder.addTarget(rawReader.getSurface());
+ multiBuilder.addTarget(jpegReader.getSurface());
+
+ // Start preview.
+ mSession.setRepeatingRequest(previewBuilder.build(), null, mHandler);
+
+ // Poor man's 3A, wait 2 seconds for AE/AF (if any) to settle.
+ // TODO: Do proper 3A trigger and lock (see testTakePictureTest).
+ Thread.sleep(3000);
+
+ multiBuilder.set(CaptureRequest.STATISTICS_LENS_SHADING_MAP_MODE,
+ CaptureRequest.STATISTICS_LENS_SHADING_MAP_MODE_ON);
+ CaptureRequest multiRequest = multiBuilder.build();
+
+ mSession.capture(multiRequest, resultListener, mHandler);
+
+ CaptureResult result = resultListener.getCaptureResultForRequest(multiRequest,
+ NUM_RESULTS_WAIT_TIMEOUT);
+ Image jpegImage = jpegListener.getImage(CAPTURE_IMAGE_TIMEOUT_MS);
+ basicValidateJpegImage(jpegImage, maxStillSz);
+ Image rawImage = rawListener.getImage(CAPTURE_IMAGE_TIMEOUT_MS);
+ validateRaw16Image(rawImage, size);
+ verifyRawCaptureResult(multiRequest, result);
+
+
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ try (DngCreator dngCreator = new DngCreator(mStaticInfo.getCharacteristics(), result)) {
+ dngCreator.writeImage(outputStream, rawImage);
+ }
+
+ if (DEBUG) {
+ byte[] rawBuffer = outputStream.toByteArray();
+ String rawFileName = DEBUG_FILE_NAME_BASE + "/raw16_" + TAG + size.toString() +
+ "_cam_" + mCamera.getId() + ".dng";
+ Log.d(TAG, "Dump raw file into " + rawFileName);
+ dumpFile(rawFileName, rawBuffer);
+
+ byte[] jpegBuffer = getDataFromImage(jpegImage);
+ String jpegFileName = DEBUG_FILE_NAME_BASE + "/jpeg_" + TAG + size.toString() +
+ "_cam_" + mCamera.getId() + ".jpg";
+ Log.d(TAG, "Dump jpeg file into " + rawFileName);
+ dumpFile(jpegFileName, jpegBuffer);
+ }
+
+ stopPreview();
+ } finally {
+ CameraTestUtils.closeImageReader(rawReader);
+ CameraTestUtils.closeImageReader(jpegReader);
+ rawReader = null;
+ jpegReader = null;
+ }
+ }
+
+ /**
+ * Validate that raw {@link CaptureResult}.
+ *
+ * @param rawRequest a {@link CaptureRequest} use to capture a RAW16 image.
+ * @param rawResult the {@link CaptureResult} corresponding to the given request.
+ */
+ private void verifyRawCaptureResult(CaptureRequest rawRequest, CaptureResult rawResult) {
+ assertNotNull(rawRequest);
+ assertNotNull(rawResult);
+
+ Rational[] empty = new Rational[] { Rational.ZERO, Rational.ZERO, Rational.ZERO};
+ Rational[] neutralColorPoint = mCollector.expectKeyValueNotNull("NeutralColorPoint",
+ rawResult, CaptureResult.SENSOR_NEUTRAL_COLOR_POINT);
+ if (neutralColorPoint != null) {
+ mCollector.expectEquals("NeutralColorPoint length", empty.length,
+ neutralColorPoint.length);
+ mCollector.expectNotEquals("NeutralColorPoint cannot be all zeroes, ", empty,
+ neutralColorPoint);
+ mCollector.expectValuesGreaterOrEqual("NeutralColorPoint", neutralColorPoint,
+ Rational.ZERO);
+ }
+
+ mCollector.expectKeyValueGreaterOrEqual(rawResult, CaptureResult.SENSOR_GREEN_SPLIT, 0.0f);
+
+ Pair<Double, Double>[] noiseProfile = mCollector.expectKeyValueNotNull("NoiseProfile",
+ rawResult, CaptureResult.SENSOR_NOISE_PROFILE);
+ if (noiseProfile != null) {
+ mCollector.expectEquals("NoiseProfile length", noiseProfile.length,
+ /*Num CFA channels*/4);
+ for (Pair<Double, Double> p : noiseProfile) {
+ mCollector.expectTrue("NoiseProfile coefficients " + p +
+ " must have: S > 0, O >= 0", p.first > 0 && p.second >= 0);
+ }
+ }
+
+ Integer hotPixelMode = mCollector.expectKeyValueNotNull("HotPixelMode", rawResult,
+ CaptureResult.HOT_PIXEL_MODE);
+ Boolean hotPixelMapMode = mCollector.expectKeyValueNotNull("HotPixelMapMode", rawResult,
+ CaptureResult.STATISTICS_HOT_PIXEL_MAP_MODE);
+ Point[] hotPixelMap = rawResult.get(CaptureResult.STATISTICS_HOT_PIXEL_MAP);
+
+ Size pixelArraySize = mStaticInfo.getPixelArraySizeChecked();
+ boolean[] availableHotPixelMapModes = mStaticInfo.getValueFromKeyNonNull(
+ CameraCharacteristics.STATISTICS_INFO_AVAILABLE_HOT_PIXEL_MAP_MODES);
+
+ if (hotPixelMode != null) {
+ Integer requestMode = mCollector.expectKeyValueNotNull(rawRequest,
+ CaptureRequest.HOT_PIXEL_MODE);
+ if (requestMode != null) {
+ mCollector.expectKeyValueEquals(rawResult, CaptureResult.HOT_PIXEL_MODE,
+ requestMode);
+ }
+ }
+
+ if (hotPixelMapMode != null) {
+ Boolean requestMapMode = mCollector.expectKeyValueNotNull(rawRequest,
+ CaptureRequest.STATISTICS_HOT_PIXEL_MAP_MODE);
+ if (requestMapMode != null) {
+ mCollector.expectKeyValueEquals(rawResult,
+ CaptureResult.STATISTICS_HOT_PIXEL_MAP_MODE, requestMapMode);
+ }
+
+ if (!hotPixelMapMode) {
+ mCollector.expectTrue("HotPixelMap must be empty", hotPixelMap == null ||
+ hotPixelMap.length == 0);
+ } else {
+ mCollector.expectTrue("HotPixelMap must not be empty", hotPixelMap != null);
+ mCollector.expectNotNull("AvailableHotPixelMapModes must not be null",
+ availableHotPixelMapModes);
+ if (availableHotPixelMapModes != null) {
+ mCollector.expectContains("HotPixelMapMode", availableHotPixelMapModes, true);
+ }
+
+ int height = pixelArraySize.getHeight();
+ int width = pixelArraySize.getWidth();
+ for (Point p : hotPixelMap) {
+ mCollector.expectTrue("Hotpixel " + p + " must be in pixelArray " +
+ pixelArraySize, p.x >= 0 && p.x < width && p.y >= 0 && p.y < height);
+ }
+ }
+ }
+ // TODO: profileHueSatMap, and profileToneCurve aren't supported yet.
+
+ }
+
+ //----------------------------------------------------------------
+ //---------Below are common functions for all tests.--------------
+ //----------------------------------------------------------------
+ /**
+ * Validate standard raw (RAW16) capture image.
+ *
+ * @param image The raw16 format image captured
+ * @param rawSize The expected raw size
+ */
+ private static void validateRaw16Image(Image image, Size rawSize) {
+ CameraTestUtils.validateImage(image, rawSize.getWidth(), rawSize.getHeight(),
+ ImageFormat.RAW_SENSOR, /*filePath*/null);
+ }
+
+ /**
+ * Validate JPEG capture image object sanity and test.
+ * <p>
+ * In addition to image object sanity, this function also does the decoding
+ * test, which is slower.
+ * </p>
+ *
+ * @param image The JPEG image to be verified.
+ * @param jpegSize The JPEG capture size to be verified against.
+ */
+ private static void validateJpegCapture(Image image, Size jpegSize) {
+ CameraTestUtils.validateImage(image, jpegSize.getWidth(), jpegSize.getHeight(),
+ ImageFormat.JPEG, /*filePath*/null);
+ }
+
+ private static class SimpleAutoFocusListener implements Camera2Focuser.AutoFocusListener {
+ final ConditionVariable focusDone = new ConditionVariable();
+ @Override
+ public void onAutoFocusLocked(boolean success) {
+ focusDone.open();
+ }
+
+ public void waitForAutoFocusDone(long timeoutMs) {
+ if (focusDone.block(timeoutMs)) {
+ focusDone.close();
+ } else {
+ throw new TimeoutRuntimeException("Wait for auto focus done timed out after "
+ + timeoutMs + "ms");
+ }
+ }
+ }
+
+ private boolean isRegionsSupportedFor3A(int index) {
+ int maxRegions = 0;
+ switch (index) {
+ case MAX_REGIONS_AE_INDEX:
+ maxRegions = mStaticInfo.getAeMaxRegionsChecked();
+ break;
+ case MAX_REGIONS_AWB_INDEX:
+ maxRegions = mStaticInfo.getAwbMaxRegionsChecked();
+ break;
+ case MAX_REGIONS_AF_INDEX:
+ maxRegions = mStaticInfo.getAfMaxRegionsChecked();
+ break;
+ default:
+ throw new IllegalArgumentException("Unknown algorithm index");
+ }
+ boolean isRegionsSupported = maxRegions > 0;
+ if (index == MAX_REGIONS_AF_INDEX && isRegionsSupported) {
+ mCollector.expectTrue(
+ "Device reports non-zero max AF region count for a camera without focuser!",
+ mStaticInfo.hasFocuser());
+ isRegionsSupported = isRegionsSupported && mStaticInfo.hasFocuser();
+ }
+
+ return isRegionsSupported;
+ }
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/CameraStressTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/CameraStressTest.java
index a112c73..d1193de 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/CameraStressTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/CameraStressTest.java
@@ -17,18 +17,16 @@
package com.android.mediaframeworktest.stress;
import com.android.mediaframeworktest.MediaFrameworkTest;
-import com.android.mediaframeworktest.CameraTestHelper;
+import com.android.mediaframeworktest.helpers.CameraTestHelper;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
-import java.io.IOException;
import java.io.Writer;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.List;
-import android.hardware.Camera;
import android.hardware.Camera.Parameters;
import android.os.Environment;
import android.os.Handler;
@@ -37,9 +35,6 @@
import android.test.suitebuilder.annotation.LargeTest;
import android.util.Log;
import android.view.SurfaceHolder;
-import com.android.mediaframeworktest.CameraStressTestRunner;
-
-import junit.framework.Assert;
/**
* Junit / Instrumentation test case for the following camera APIs:
diff --git a/packages/DocumentsUI/AndroidManifest.xml b/packages/DocumentsUI/AndroidManifest.xml
index c3452d5..fa9ff01 100644
--- a/packages/DocumentsUI/AndroidManifest.xml
+++ b/packages/DocumentsUI/AndroidManifest.xml
@@ -54,8 +54,7 @@
android:name=".LauncherActivity"
android:theme="@android:style/Theme.NoDisplay"
android:icon="@drawable/ic_files_app"
- android:label="@string/files_label"
- android:enabled="@bool/productivity_device">
+ android:label="@string/files_label">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
diff --git a/packages/DocumentsUI/res/values-af/strings.xml b/packages/DocumentsUI/res/values-af/strings.xml
index 9931a6b..f0c48ec 100644
--- a/packages/DocumentsUI/res/values-af/strings.xml
+++ b/packages/DocumentsUI/res/values-af/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Nuwe venster"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopieer"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Plak"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Wys interne berging"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Wys SD-kaart"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Versteek interne berging"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Versteek SD-kaart"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Wys interne berging"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Versteek interne berging"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Wys lêergrootte"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Versteek lêergrootte"</string>
<string name="button_select" msgid="527196987259139214">"Kies"</string>
@@ -99,10 +97,10 @@
<item quantity="one">Kon <xliff:g id="COUNT_0">%1$d</xliff:g> lêer nie uitvee nie</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Tik om besonderhede te bekyk"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Maak toe"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Hierdie lêers is nie gekopieer nie: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Hierdie lêers is nie geskuif nie: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Hierdie lêers is na \'n ander formaat omgeskakel: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">Het <xliff:g id="COUNT_1">%1$d</xliff:g> lêers na die knipbord gekopieer.</item>
<item quantity="one">Het <xliff:g id="COUNT_0">%1$d</xliff:g> lêer na die knipbord gekopieer.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Kan nie die geselekteerde lêers in hierdie ligging plak nie."</string>
<string name="menu_rename" msgid="7678802479104285353">"Hernoem"</string>
<string name="rename_error" msgid="4203041674883412606">"Kon nie dokument hernoem nie"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Sommige lêers is omgeskakel"</string>
+ <string name="allow" msgid="7225948811296386551">"Laat toe"</string>
+ <string name="deny" msgid="2081879885755434506">"Weier"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-am/strings.xml b/packages/DocumentsUI/res/values-am/strings.xml
index cccaf51..aa11af1 100644
--- a/packages/DocumentsUI/res/values-am/strings.xml
+++ b/packages/DocumentsUI/res/values-am/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"አዲሰ መስኮት"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"ቅዳ"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"ለጥፍ"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"ውስጣዊ ማከማቻ አሳይ"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD ካርድ አሳይ"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"ውስጣዊ ማከማቻ ደብቅ"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD ካርድ ደብቅ"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"ውስጣዊ ማከማቻ አሳይ"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"ውስጣዊ ማከማቻ ደብቅ"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"የፋይል መጠን አሳይ"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"የፋይል መጠን ደብቅ"</string>
<string name="button_select" msgid="527196987259139214">"ምረጥ"</string>
@@ -99,10 +97,10 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎችን መሰረዝ አልተቻለም።</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"ዝርዝሮችን ለመመልከት መታ ያድርጉ"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"ዝጋ"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"እነዚህ ፋይሎች አልተቀዱም፦ <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"እነዚህ ፋይሎች አልተወሰዱም፦ <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"እነዚህ ፋይሎች ወደ ሌላ ቅርጸት ተለውጠዋል፦ <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎች ወደ ቅንጥብ ሰሌዳ ቀድቷል።</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎች ወደ ቅንጥብ ሰሌዳ ቀድተዋል።</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"የተመረጡትን ፋይሎች ወደዚህ አካባቢ መለጠፍ አይቻልም።"</string>
<string name="menu_rename" msgid="7678802479104285353">"እንደገና ሰይም"</string>
<string name="rename_error" msgid="4203041674883412606">"ሰነዱን ዳግም መሰየም አልተሳካም"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"አንዳንድ ፋይሎች ተለውጠዋል"</string>
+ <string name="allow" msgid="7225948811296386551">"ይፍቀዱ"</string>
+ <string name="deny" msgid="2081879885755434506">"ያስተባብሉ"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-ar/strings.xml b/packages/DocumentsUI/res/values-ar/strings.xml
index 1177de7..966fb17 100644
--- a/packages/DocumentsUI/res/values-ar/strings.xml
+++ b/packages/DocumentsUI/res/values-ar/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"نافذة جديدة"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"نسخ"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"لصق"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"إظهار وحدة التخزين الداخلية"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"إظهار بطاقة SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"إخفاء وحدة التخزين الداخلية"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"إخفاء بطاقة SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"إظهار وحدة التخزين الداخلية"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"إخفاء وحدة التخزين الداخلية"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"إظهار حجم الملف"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"إخفاء حجم الملف"</string>
<string name="button_select" msgid="527196987259139214">"تحديد"</string>
@@ -123,10 +121,10 @@
<item quantity="one">تعذر حذف <xliff:g id="COUNT_0">%1$d</xliff:g> ملف</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"انقر لعرض التفاصيل."</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"إغلاق"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"لم يتم نسخ هذه الملفات: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"لم يتم نقل الملفات التالية: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"تم تحويل هذه الملفات إلى تنسيق آخر: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="zero">لم يتم نسخ أي ملف (<xliff:g id="COUNT_1">%1$d</xliff:g>) إلى الحافظة.</item>
<item quantity="two">تم نسخ ملفين اثنين (<xliff:g id="COUNT_1">%1$d</xliff:g>) إلى الحافظة.</item>
@@ -138,4 +136,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"يتعذر لصق الملفات المحددة في هذا الموقع."</string>
<string name="menu_rename" msgid="7678802479104285353">"إعادة تسمية"</string>
<string name="rename_error" msgid="4203041674883412606">"أخفقت إعادة تسمية المستند."</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"تم تحويل بعض الملفات"</string>
+ <string name="allow" msgid="7225948811296386551">"السماح"</string>
+ <string name="deny" msgid="2081879885755434506">"رفض"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-az-rAZ/strings.xml b/packages/DocumentsUI/res/values-az-rAZ/strings.xml
index 2482ff0..8864a27 100644
--- a/packages/DocumentsUI/res/values-az-rAZ/strings.xml
+++ b/packages/DocumentsUI/res/values-az-rAZ/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Yeni pəncərə"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopyalayın"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Yerləşdirin"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Daxili yaddaşı göstərin"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD kartı göstərin"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Daxili yaddaşı gizlədin"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD kartı gizlədin"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Daxili yaddaşı göstərin"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Daxili yaddaşı gizlədin"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Fayl ölçüsünü göstərin"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Fayl ölçüsünü gizlədin"</string>
<string name="button_select" msgid="527196987259139214">"Seçin"</string>
@@ -99,10 +97,10 @@
<item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> fayl silinmədi</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Detallara baxmaq üçün basın"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Bağla"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Bu fayllar kopyalanmadı: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Bu fayllar köçürülmədi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Bu fayllar başqa formata konvertasiya edilib: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fayl buferə kopyalandı.</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fayl buferə kopyalandı.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Seçilmiş faylları bu məkana yerləşdirmək olmaz."</string>
<string name="menu_rename" msgid="7678802479104285353">"Adını dəyişdirin"</string>
<string name="rename_error" msgid="4203041674883412606">"Sənəd adını dəyişmək uğursuz oldu"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Bəzi fayllar konvertasiya edilib"</string>
+ <string name="allow" msgid="7225948811296386551">"İcazə verin"</string>
+ <string name="deny" msgid="2081879885755434506">"Rədd et"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml b/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml
index 28a35c7..9e9dfb1 100644
--- a/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml
+++ b/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Novi prozor"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiraj"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Nalepi"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Prikaži internu memoriju"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Prikaži SD karticu"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Sakrij internu memoriju"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Sakrij SD karticu"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Prikaži internu memoriju"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Sakrij internu memoriju"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Prikaži veličinu datoteke"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Sakrij veličinu datoteke"</string>
<string name="button_select" msgid="527196987259139214">"Izaberi"</string>
@@ -105,10 +103,10 @@
<item quantity="other">Brisanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka nije uspelo</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Dodirnite da biste prikazali detalje"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Zatvori"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Sledeće datoteke nisu kopirane: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Ove datoteke nisu premeštene: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Ove datoteke su konvertovane u drugi format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one">Kopirali ste <xliff:g id="COUNT_1">%1$d</xliff:g> datoteku u privremenu memoriju.</item>
<item quantity="few">Kopirali ste <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke u privremenu memoriju.</item>
@@ -117,4 +115,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Izabrane datoteke ne mogu da se nalepe na ovoj lokaciji."</string>
<string name="menu_rename" msgid="7678802479104285353">"Preimenuj"</string>
<string name="rename_error" msgid="4203041674883412606">"Preimenovanje dokumenta nije uspelo"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Neke datoteke su konvertovane"</string>
+ <string name="allow" msgid="7225948811296386551">"Dozvoli"</string>
+ <string name="deny" msgid="2081879885755434506">"Odbij"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-bg/strings.xml b/packages/DocumentsUI/res/values-bg/strings.xml
index bdebffb..6544c57 100644
--- a/packages/DocumentsUI/res/values-bg/strings.xml
+++ b/packages/DocumentsUI/res/values-bg/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Нов прозорец"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Копиране"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Поставяне"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Вътр. хранилище: Показв."</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD карта: Показване"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Вътр. хранилище: Скрив."</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD карта: Скриване"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Вътр. хранилище: Показв."</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Вътр. хранилище: Скрив."</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Размер на файла: Показв."</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Размер на файла: Скрив."</string>
<string name="button_select" msgid="527196987259139214">"Избиране"</string>
@@ -99,10 +97,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файл не можа да бъде изтрит</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Докоснете, за да видите подробности"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Затваряне"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Следните файлове не бяха копирани: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Следните файлове не бяха преместени: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Следните файлове бяха преобразувани в друг формат: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">Копирахте <xliff:g id="COUNT_1">%1$d</xliff:g> файла в буферната памет.</item>
<item quantity="one">Копирахте <xliff:g id="COUNT_0">%1$d</xliff:g> файл в буферната памет.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Избраните файлове не могат да се поставят на това място."</string>
<string name="menu_rename" msgid="7678802479104285353">"Преименуване"</string>
<string name="rename_error" msgid="4203041674883412606">"Преименуването на документа не бе успешно"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Някои файлове бяха преобразувани"</string>
+ <string name="allow" msgid="7225948811296386551">"Разрешаване"</string>
+ <string name="deny" msgid="2081879885755434506">"Отказване"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-bn-rBD/strings.xml b/packages/DocumentsUI/res/values-bn-rBD/strings.xml
index 0ede613..84328a8 100644
--- a/packages/DocumentsUI/res/values-bn-rBD/strings.xml
+++ b/packages/DocumentsUI/res/values-bn-rBD/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"নতুন উইন্ডো"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"প্রতিলিপি করুন"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"আটকান"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"অভ্যন্তরীণ সঞ্চয়স্থান দেখান"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD কার্ড দেখান"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"অভ্যন্তরীণ সঞ্চয়স্থান লুকান"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD কার্ড লুকান"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"অভ্যন্তরীণ সঞ্চয়স্থান দেখান"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"অভ্যন্তরীণ সঞ্চয়স্থান লুকান"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"ফাইলের আকার দেখান"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"ফাইলের আকার লুকান"</string>
<string name="button_select" msgid="527196987259139214">"নির্বাচন করুন"</string>
@@ -99,10 +97,10 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল মোছা গেল না</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"বিশদ বিবরণ দেখতে আলতো চাপুন"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"বন্ধ করুন"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"এই ফাইলগুলির প্রতিলিপি করা হয় নি: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"এই ফাইলগুলি সরানো হয়নি: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"এই ফাইলগুলি অন্য ফরম্যাটে রূপান্তর করা হয়েছে: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল ক্লিপবোর্ডে প্রতিলিপি করা হয়েছে।</item>
<item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল ক্লিপবোর্ডে প্রতিলিপি করা হয়েছে।</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"এই স্থানে নির্বাচিত ফাইলগুলি আটকানো যাবে না।"</string>
<string name="menu_rename" msgid="7678802479104285353">"পুনঃনামকরণ"</string>
<string name="rename_error" msgid="4203041674883412606">"দস্তাবেজের পুনঃনামকরণ ব্যর্থ হয়েছে৷"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"কিছু ফাইল রূপান্তরিত হয়েছে"</string>
+ <string name="allow" msgid="7225948811296386551">"অনুমতি দিন"</string>
+ <string name="deny" msgid="2081879885755434506">"আস্বীকার করুন"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-bs-rBA/strings.xml b/packages/DocumentsUI/res/values-bs-rBA/strings.xml
index bba1053..d8797a3 100644
--- a/packages/DocumentsUI/res/values-bs-rBA/strings.xml
+++ b/packages/DocumentsUI/res/values-bs-rBA/strings.xml
@@ -60,12 +60,8 @@
<skip />
<!-- no translation found for menu_advanced_show (4693652895715631401) -->
<skip />
- <!-- no translation found for menu_advanced_show (5792182900084144261) -->
- <skip />
<!-- no translation found for menu_advanced_hide (4218809952721972589) -->
<skip />
- <!-- no translation found for menu_advanced_hide (4845869969015718848) -->
- <skip />
<!-- no translation found for menu_file_size_show (3240323619260823076) -->
<skip />
<!-- no translation found for menu_file_size_hide (8881975928502581042) -->
@@ -110,7 +106,7 @@
<skip />
<!-- no translation found for empty (7858882803708117596) -->
<skip />
- <string name="no_results" msgid="6622510343880730446">"Nema utakmica u %1$s"</string>
+ <string name="no_results" msgid="6622510343880730446">"Nema rezultata u %1$s"</string>
<!-- no translation found for toast_no_application (1339885974067891667) -->
<skip />
<!-- no translation found for toast_failed_delete (2180678019407244069) -->
@@ -141,15 +137,20 @@
<item quantity="other">Nije bilo moguće izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Dodirnite za prikaz detalja"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Zatvori"</string>
<!-- no translation found for copy_failure_alert_content (3715575000297709082) -->
<skip />
<!-- no translation found for move_failure_alert_content (7151140279020481180) -->
<skip />
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Ove datoteke su pretvorene u drugi format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<!-- no translation found for clipboard_files_clipped (855459017537058539) -->
<!-- no translation found for clipboard_files_cannot_paste (2878324825602325706) -->
<skip />
<string name="menu_rename" msgid="7678802479104285353">"Preimenuj"</string>
<string name="rename_error" msgid="4203041674883412606">"Nije uspjelo preimenovanje dokumenta"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Neke od datoteka su pretvorene"</string>
+ <!-- no translation found for allow (7225948811296386551) -->
+ <skip />
+ <!-- no translation found for deny (2081879885755434506) -->
+ <skip />
</resources>
diff --git a/packages/DocumentsUI/res/values-ca/strings.xml b/packages/DocumentsUI/res/values-ca/strings.xml
index 93e92cc..3cf069b 100644
--- a/packages/DocumentsUI/res/values-ca/strings.xml
+++ b/packages/DocumentsUI/res/values-ca/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Finestra nova"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copia"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Enganxa"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Mostra emmagatz. intern"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Mostra la targeta SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Amaga emmagatz. intern"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Amaga la targeta SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Mostra emmagatz. intern"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Amaga emmagatz. intern"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Mostra la mida del fitxer"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Amaga la mida del fitxer"</string>
<string name="button_select" msgid="527196987259139214">"Selecciona"</string>
@@ -99,10 +97,10 @@
<item quantity="one">No s\'ha pogut suprimir <xliff:g id="COUNT_0">%1$d</xliff:g> fitxer</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Toca per veure\'n els detalls"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Tanca"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Aquests fitxers no s\'han copiat: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Aquests fitxers no s\'han mogut: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Aquests fitxers s\'han convertit a un altre format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">S\'han copiat <xliff:g id="COUNT_1">%1$d</xliff:g> fitxers al porta-retalls.</item>
<item quantity="one">S\'ha copiat <xliff:g id="COUNT_0">%1$d</xliff:g> fitxer al porta-retalls.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"No s\'han pogut enganxar els fitxers seleccionats en aquesta ubicació."</string>
<string name="menu_rename" msgid="7678802479104285353">"Canvia el nom"</string>
<string name="rename_error" msgid="4203041674883412606">"No s\'ha pogut canviar el nom del document"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"S\'han convertit alguns fitxers"</string>
+ <string name="allow" msgid="7225948811296386551">"Permet"</string>
+ <string name="deny" msgid="2081879885755434506">"Denega"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-cs/strings.xml b/packages/DocumentsUI/res/values-cs/strings.xml
index ef2b554..b6b9a88 100644
--- a/packages/DocumentsUI/res/values-cs/strings.xml
+++ b/packages/DocumentsUI/res/values-cs/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Nové okno"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopírovat"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Vložit"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Zobrazit inter. úložiště"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Zobrazit SD kartu"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Skrýt interní úložiště"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Skrýt SD kartu"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Zobrazit inter. úložiště"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Skrýt interní úložiště"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Zobrazit velikost souboru"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Skrýt velikost souboru"</string>
<string name="button_select" msgid="527196987259139214">"Vybrat"</string>
@@ -111,10 +109,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> soubor se smazat nepodařilo</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Klepnutím zobrazíte podrobnosti"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Zavřít"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Tyto soubory nebyly zkopírovány: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Následující soubory nebyly přesunuty: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Soubory byly převedeny do jiného formátu: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> soubory byly zkopírovány do schránky.</item>
<item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> souboru bylo zkopírováno do schránky.</item>
@@ -124,4 +122,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Vybrané soubory nelze vložit do tohoto umístění."</string>
<string name="menu_rename" msgid="7678802479104285353">"Přejmenovat"</string>
<string name="rename_error" msgid="4203041674883412606">"Dokument se nepodařilo přejmenovat."</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Některé soubory byly převedeny"</string>
+ <string name="allow" msgid="7225948811296386551">"Povolit"</string>
+ <string name="deny" msgid="2081879885755434506">"Odepřít"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-da/strings.xml b/packages/DocumentsUI/res/values-da/strings.xml
index b80ec57..2c45d3b 100644
--- a/packages/DocumentsUI/res/values-da/strings.xml
+++ b/packages/DocumentsUI/res/values-da/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Nyt vindue"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiér"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Indsæt"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Vis intern lagerplads"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Vis SD-kort"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Skjul intern lagerplads"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Skjul SD-kort"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Vis intern lagerplads"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Skjul intern lagerplads"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Vis filstørrelse"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Skjul filstørrelse"</string>
<string name="button_select" msgid="527196987259139214">"Vælg"</string>
@@ -99,10 +97,10 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> filer kunne ikke slettes</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Tryk for at se oplysninger"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Luk"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Disse filer blev ikke kopieret: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Følgende filer blev ikke flyttet: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Disse filer er konverteret til et andet format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> filer blev kopieret til udklipsholder.</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> filer blev kopieret til udklipsholder.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"De valgte filer kan ikke indsættes på denne placering."</string>
<string name="menu_rename" msgid="7678802479104285353">"Omdøb"</string>
<string name="rename_error" msgid="4203041674883412606">"Dokumentet kunne ikke omdøbes"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Nogle filer er konverteret"</string>
+ <string name="allow" msgid="7225948811296386551">"Tillad"</string>
+ <string name="deny" msgid="2081879885755434506">"Afvis"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-de/strings.xml b/packages/DocumentsUI/res/values-de/strings.xml
index 1363428..37ed4df 100644
--- a/packages/DocumentsUI/res/values-de/strings.xml
+++ b/packages/DocumentsUI/res/values-de/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Neues Fenster"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopieren"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Einfügen"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Int. Speicher anzeigen"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD-Karte anzeigen"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Int. Speicher ausblenden"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD-Karte ausblenden"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Int. Speicher anzeigen"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Int. Speicher ausblenden"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Dateigröße anzeigen"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Dateigröße ausblenden"</string>
<string name="button_select" msgid="527196987259139214">"Auswählen"</string>
@@ -99,10 +97,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Datei konnte nicht gelöscht werden</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Zum Ansehen der Details tippen"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Schließen"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Diese Dateien wurden nicht kopiert: <xliff:g id="LIST">%1$s</xliff:g>."</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Diese Dateien wurden nicht verschoben: <xliff:g id="LIST">%1$s</xliff:g>."</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Folgende Dateien wurden in ein anderes Format konvertiert: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Dateien wurden in die Zwischenablage kopiert.</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Datei wurde in die Zwischenablage kopiert.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Die ausgewählten Dateien können an diesem Ort nicht eingefügt werden."</string>
<string name="menu_rename" msgid="7678802479104285353">"Umbenennen"</string>
<string name="rename_error" msgid="4203041674883412606">"Dokument konnte nicht umbenannt werden"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Einige Dateien wurden konvertiert"</string>
+ <string name="allow" msgid="7225948811296386551">"Zulassen"</string>
+ <string name="deny" msgid="2081879885755434506">"Ablehnen"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-el/strings.xml b/packages/DocumentsUI/res/values-el/strings.xml
index a1d28f5..396fa12 100644
--- a/packages/DocumentsUI/res/values-el/strings.xml
+++ b/packages/DocumentsUI/res/values-el/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Νέο παράθυρο"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Αντιγραφή"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Επικόλληση"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Εμφ.εσωτ.χώρου αποθήκ."</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Εμφάνιση κάρτας SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Απόκρ.εσωτ.χώρου αποθήκ."</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Απόκρυψη κάρτας SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Εμφ.εσωτ.χώρου αποθήκ."</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Απόκρ.εσωτ.χώρου αποθήκ."</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Εμφ. μεγέθους αρχείου"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Απόκρ. μεγέθους αρχείου"</string>
<string name="button_select" msgid="527196987259139214">"Επιλογή"</string>
@@ -99,10 +97,10 @@
<item quantity="one">Δεν ήταν δυνατή η διαγραφή <xliff:g id="COUNT_0">%1$d</xliff:g> αρχείου</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Πατήστε για προβολή λεπτομερειών"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Κλείσιμο"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Αυτά τα αρχεία δεν αντιγράφηκαν: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Αυτά τα αρχεία δεν μετακινήθηκαν: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Αυτά τα αρχεία μετατράπηκαν σε άλλη μορφή: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> αρχεία αντιγράφηκαν στο πρόχειρο.</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> αρχείο αντιγράφηκε στο πρόχειρο.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Δεν είναι δυνατή η επικόλληση των επιλεγμένων αρχείων σε αυτήν την τοποθεσία."</string>
<string name="menu_rename" msgid="7678802479104285353">"Μετονομασία"</string>
<string name="rename_error" msgid="4203041674883412606">"Αποτυχία μετονομασίας εγγράφου"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Ορισμένα αρχεία μετατράπηκαν"</string>
+ <string name="allow" msgid="7225948811296386551">"Να επιτρέπεται"</string>
+ <string name="deny" msgid="2081879885755434506">"Άρνηση"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-en-rAU/strings.xml b/packages/DocumentsUI/res/values-en-rAU/strings.xml
index ad4fafd..e96fef9 100644
--- a/packages/DocumentsUI/res/values-en-rAU/strings.xml
+++ b/packages/DocumentsUI/res/values-en-rAU/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"New window"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copy"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Paste"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Show internal storage"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Show SD card"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Hide internal storage"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Hide SD card"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Show internal storage"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Hide internal storage"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Show file size"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Hide file size"</string>
<string name="button_select" msgid="527196987259139214">"select"</string>
@@ -99,10 +97,10 @@
<item quantity="one">Couldn\'t delete <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Tap to view details"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Close"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"These files weren\'t copied: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"These files weren\'t moved: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"These files were converted to another format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">Copied <xliff:g id="COUNT_1">%1$d</xliff:g> files to clipboard.</item>
<item quantity="one">Copied <xliff:g id="COUNT_0">%1$d</xliff:g> file to clipboard.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Cannot paste the selected files in this location."</string>
<string name="menu_rename" msgid="7678802479104285353">"rename"</string>
<string name="rename_error" msgid="4203041674883412606">"Failed to rename document"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Some files were converted"</string>
+ <string name="allow" msgid="7225948811296386551">"Allow"</string>
+ <string name="deny" msgid="2081879885755434506">"Deny"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-en-rGB/strings.xml b/packages/DocumentsUI/res/values-en-rGB/strings.xml
index ad4fafd..e96fef9 100644
--- a/packages/DocumentsUI/res/values-en-rGB/strings.xml
+++ b/packages/DocumentsUI/res/values-en-rGB/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"New window"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copy"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Paste"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Show internal storage"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Show SD card"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Hide internal storage"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Hide SD card"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Show internal storage"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Hide internal storage"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Show file size"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Hide file size"</string>
<string name="button_select" msgid="527196987259139214">"select"</string>
@@ -99,10 +97,10 @@
<item quantity="one">Couldn\'t delete <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Tap to view details"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Close"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"These files weren\'t copied: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"These files weren\'t moved: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"These files were converted to another format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">Copied <xliff:g id="COUNT_1">%1$d</xliff:g> files to clipboard.</item>
<item quantity="one">Copied <xliff:g id="COUNT_0">%1$d</xliff:g> file to clipboard.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Cannot paste the selected files in this location."</string>
<string name="menu_rename" msgid="7678802479104285353">"rename"</string>
<string name="rename_error" msgid="4203041674883412606">"Failed to rename document"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Some files were converted"</string>
+ <string name="allow" msgid="7225948811296386551">"Allow"</string>
+ <string name="deny" msgid="2081879885755434506">"Deny"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-en-rIN/strings.xml b/packages/DocumentsUI/res/values-en-rIN/strings.xml
index ad4fafd..e96fef9 100644
--- a/packages/DocumentsUI/res/values-en-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-en-rIN/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"New window"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copy"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Paste"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Show internal storage"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Show SD card"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Hide internal storage"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Hide SD card"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Show internal storage"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Hide internal storage"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Show file size"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Hide file size"</string>
<string name="button_select" msgid="527196987259139214">"select"</string>
@@ -99,10 +97,10 @@
<item quantity="one">Couldn\'t delete <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Tap to view details"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Close"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"These files weren\'t copied: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"These files weren\'t moved: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"These files were converted to another format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">Copied <xliff:g id="COUNT_1">%1$d</xliff:g> files to clipboard.</item>
<item quantity="one">Copied <xliff:g id="COUNT_0">%1$d</xliff:g> file to clipboard.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Cannot paste the selected files in this location."</string>
<string name="menu_rename" msgid="7678802479104285353">"rename"</string>
<string name="rename_error" msgid="4203041674883412606">"Failed to rename document"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Some files were converted"</string>
+ <string name="allow" msgid="7225948811296386551">"Allow"</string>
+ <string name="deny" msgid="2081879885755434506">"Deny"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-es-rUS/strings.xml b/packages/DocumentsUI/res/values-es-rUS/strings.xml
index 53daa40..9f77732 100644
--- a/packages/DocumentsUI/res/values-es-rUS/strings.xml
+++ b/packages/DocumentsUI/res/values-es-rUS/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Ventana nueva"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copiar"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Pegar"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Mostrar almacen. interno"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Mostrar tarjeta SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Ocultar almacen. interno"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ocultar tarjeta SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Mostrar almacen. interno"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Ocultar almacen. interno"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tamaño archivos"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tamaño archivos"</string>
<string name="button_select" msgid="527196987259139214">"Seleccionar"</string>
@@ -99,10 +97,10 @@
<item quantity="one">No se pudo borrar <xliff:g id="COUNT_0">%1$d</xliff:g> archivo</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Presiona para ver los detalles"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Cerrar"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"No se copiaron estos archivos: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"No se movieron los siguientes archivos: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Estos archivos se convirtieron a otro formato: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">Se copiaron <xliff:g id="COUNT_1">%1$d</xliff:g> archivos al portapapeles.</item>
<item quantity="one">Se copió <xliff:g id="COUNT_0">%1$d</xliff:g> archivo al portapapeles.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"No se pueden pegar los archivos seleccionados en esta ubicación."</string>
<string name="menu_rename" msgid="7678802479104285353">"Cambiar nombre"</string>
<string name="rename_error" msgid="4203041674883412606">"No se pudo cambiar el nombre del documento"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Se convirtieron algunos archivos"</string>
+ <string name="allow" msgid="7225948811296386551">"Permitir"</string>
+ <string name="deny" msgid="2081879885755434506">"Denegar"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-es/strings.xml b/packages/DocumentsUI/res/values-es/strings.xml
index d55220c..2010f8c 100644
--- a/packages/DocumentsUI/res/values-es/strings.xml
+++ b/packages/DocumentsUI/res/values-es/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Nueva ventana"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copiar"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Pegar"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Mostrar almac. interno"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Mostrar tarjeta SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Ocultar almac. interno"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ocultar tarjeta SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Mostrar almac. interno"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Ocultar almac. interno"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tamaño del archivo"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tamaño del archivo"</string>
<string name="button_select" msgid="527196987259139214">"Seleccionar"</string>
@@ -99,10 +97,10 @@
<item quantity="one">No se ha podido eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> archivo</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Toca para ver detalles"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Cerrar"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Archivos que no se han copiado: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Archivos que no se han movido: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Estos archivos se han convertido a otro formato: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">Se han copiado <xliff:g id="COUNT_1">%1$d</xliff:g> archivos al portapapeles.</item>
<item quantity="one">Se ha copiado <xliff:g id="COUNT_0">%1$d</xliff:g> archivo al portapapeles.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Los archivos seleccionados no se pueden pegar en esta ubicación."</string>
<string name="menu_rename" msgid="7678802479104285353">"Cambiar nombre"</string>
<string name="rename_error" msgid="4203041674883412606">"Error al cambiar el nombre del documento"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Se han convertido algunos archivos"</string>
+ <string name="allow" msgid="7225948811296386551">"Permitir"</string>
+ <string name="deny" msgid="2081879885755434506">"Denegar"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-et-rEE/strings.xml b/packages/DocumentsUI/res/values-et-rEE/strings.xml
index 580e203..97577e68 100644
--- a/packages/DocumentsUI/res/values-et-rEE/strings.xml
+++ b/packages/DocumentsUI/res/values-et-rEE/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Uus aken"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopeeri"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Kleebi"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Kuva sis. salvestusruum"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Kuva SD-kaart"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Peida sis. salvestusruum"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Peida SD-kaart"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Kuva sis. salvestusruum"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Peida sis. salvestusruum"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Kuva faili suurus"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Peida faili suurus"</string>
<string name="button_select" msgid="527196987259139214">"Vali"</string>
@@ -99,10 +97,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> faili ei õnnestunud kustutada</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Puudutage üksikasjade vaatamiseks"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Sule"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Neid faile ei kopeeritud: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Neid faile ei teisaldatud: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Need failid teisendati teise vormingusse: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> faili kopeeriti lõikelauale.</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fail kopeeriti lõikelauale.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Valitud faile ei saa sellesse asukohta kleepida."</string>
<string name="menu_rename" msgid="7678802479104285353">"Nimeta ümber"</string>
<string name="rename_error" msgid="4203041674883412606">"Dokumendi ümbernimetamine ebaõnnestus"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Mõned failid teisendati"</string>
+ <string name="allow" msgid="7225948811296386551">"Luba"</string>
+ <string name="deny" msgid="2081879885755434506">"Keela"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-eu-rES/strings.xml b/packages/DocumentsUI/res/values-eu-rES/strings.xml
index 2dab78b..036c361 100644
--- a/packages/DocumentsUI/res/values-eu-rES/strings.xml
+++ b/packages/DocumentsUI/res/values-eu-rES/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Leiho berria"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiatu"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Itsatsi"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Erakutsi barneko memoria"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Erakutsi SD txartela"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Ezkutatu barneko memoria"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ezkutatu SD txartela"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Erakutsi barneko memoria"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Ezkutatu barneko memoria"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Erakutsi fitxategi-tamaina"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Ezkutatu fitxategi-tamaina"</string>
<string name="button_select" msgid="527196987259139214">"Hautatu"</string>
@@ -99,10 +97,10 @@
<item quantity="one">Ezin izan da ezabatu <xliff:g id="COUNT_0">%1$d</xliff:g> fitxategi</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Sakatu xehetasunak ikusteko"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Itxi"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Ez dira kopiatu fitxategi hauek: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Ez dira mugitu fitxategi hauek: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Fitxategi hauek beste formatu bateko fitxategi bihurtu dira: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fitxategi kopiatu dira arbelean.</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fitxategi kopiatu da arbelean.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Ezin dira itsatsi hautatutako fitxategiak kokapen honetan."</string>
<string name="menu_rename" msgid="7678802479104285353">"Aldatu izena"</string>
<string name="rename_error" msgid="4203041674883412606">"Ezin izan zaio aldatu izena dokumentuari"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Artxibo batzuk bihurtu dira"</string>
+ <string name="allow" msgid="7225948811296386551">"Onartu"</string>
+ <string name="deny" msgid="2081879885755434506">"Ukatu"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-fa/strings.xml b/packages/DocumentsUI/res/values-fa/strings.xml
index 2cfea03..7367e25 100644
--- a/packages/DocumentsUI/res/values-fa/strings.xml
+++ b/packages/DocumentsUI/res/values-fa/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"پنجره جدید"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"کپی"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"جایگذاری"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"نمایش فضای ذخیرهسازی داخلی"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"نمایش کارت SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"پنهان کردن فضای ذخیرهسازی داخلی"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"پنهان کردن کارت SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"نمایش فضای ذخیرهسازی داخلی"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"پنهان کردن فضای ذخیرهسازی داخلی"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"نمایش اندازه فایل"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"پنهان کردن اندازه فایل"</string>
<string name="button_select" msgid="527196987259139214">"انتخاب"</string>
@@ -99,10 +97,10 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فایل حذف نشد</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"برای مشاهده جزئیات ضربه بزنید"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"بستن"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"این فایلها کپی نشدند: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"این فایلها منتقل نشدند: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"این فایلها به قالب دیگری تبدیل شدند: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> فایل در بریدهدان کپی شد.</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فایل در بریدهدان کپی شد.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"نمیتوان فایلهای انتخابی را در این مکان جایگذاری کرد."</string>
<string name="menu_rename" msgid="7678802479104285353">"تغییر نام"</string>
<string name="rename_error" msgid="4203041674883412606">"نام سند تغییر نکرد"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"بعضی از فایلها تبدیل شدند"</string>
+ <string name="allow" msgid="7225948811296386551">"ارزیابیشده"</string>
+ <string name="deny" msgid="2081879885755434506">"اجازه ندارد"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-fi/strings.xml b/packages/DocumentsUI/res/values-fi/strings.xml
index b4ed0fd..2d65899 100644
--- a/packages/DocumentsUI/res/values-fi/strings.xml
+++ b/packages/DocumentsUI/res/values-fi/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Uusi ikkuna"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopioi"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Liitä"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Näytä sis. tallennustila"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Näytä SD-kortti"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Piilota sis. tallennust."</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Piilota SD-kortti"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Näytä sis. tallennustila"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Piilota sis. tallennust."</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Näytä tiedostokoko"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Piilota tiedostokoko"</string>
<string name="button_select" msgid="527196987259139214">"Valitse"</string>
@@ -99,10 +97,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> tiedoston poistaminen epäonnistui</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Tarkastele tietoja napauttamalla"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Sulje"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Seuraavia tiedostoja ei kopioitu: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Näitä tiedostoja ei siirretty: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Seuraavat tiedostot muunnettiin toiseen muotoon: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> tiedostoa kopioitiin leikepöydälle.</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> tiedosto kopioitiin leikepöydälle.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Valittuja tiedostoja ei voi liittää tähän sijaintiin."</string>
<string name="menu_rename" msgid="7678802479104285353">"Nimeä uudelleen"</string>
<string name="rename_error" msgid="4203041674883412606">"Dokumentin nimen muuttaminen epäonnistui."</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Joitakin tiedostoja muunnettiin."</string>
+ <string name="allow" msgid="7225948811296386551">"Salli"</string>
+ <string name="deny" msgid="2081879885755434506">"Kiellä"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-fr-rCA/strings.xml b/packages/DocumentsUI/res/values-fr-rCA/strings.xml
index 5bbc884..baa963a 100644
--- a/packages/DocumentsUI/res/values-fr-rCA/strings.xml
+++ b/packages/DocumentsUI/res/values-fr-rCA/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Nouvelle fenêtre"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copier"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Coller"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Aff. mém. stock. interne"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Afficher la carte SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Masquer mém. stock. int."</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Masquer la carte SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Aff. mém. stock. interne"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Masquer mém. stock. int."</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Afficher taille fichier"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Masquer taille fichier"</string>
<string name="button_select" msgid="527196987259139214">"Sélectionner"</string>
@@ -99,10 +97,10 @@
<item quantity="other">Impossible de supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> dossiers</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Touchez pour afficher les détails"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Fermer"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Ces fichiers ne ont pas été copiés : <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Ces fichiers n\'ont pas été déplacés : <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Ces fichiers ont été convertis dans un autre format : <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fichier a été copié dans le presse-papiers.</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fichiers ont été copiés dans le presse-papiers.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Impossible de coller les fichiers sélectionnés à cet endroit."</string>
<string name="menu_rename" msgid="7678802479104285353">"Renommer"</string>
<string name="rename_error" msgid="4203041674883412606">"Impossible de renommer le document"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Certains fichiers ont été convertis"</string>
+ <string name="allow" msgid="7225948811296386551">"Autoriser"</string>
+ <string name="deny" msgid="2081879885755434506">"Refuser"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-fr/strings.xml b/packages/DocumentsUI/res/values-fr/strings.xml
index 2e06b74..d30a130 100644
--- a/packages/DocumentsUI/res/values-fr/strings.xml
+++ b/packages/DocumentsUI/res/values-fr/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Nouvelle fenêtre"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copier"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Coller"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Aff. mém. stock. interne"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Afficher la carte SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Masquer mém. stock. int."</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Masquer la carte SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Aff. mém. stock. interne"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Masquer mém. stock. int."</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Afficher taille fichier"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Masquer taille fichier"</string>
<string name="button_select" msgid="527196987259139214">"Sélectionner"</string>
@@ -99,10 +97,10 @@
<item quantity="other">Impossible de supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> fichiers</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Appuyez pour afficher plus d\'informations."</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Fermer"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Les fichiers suivants n\'ont pas été copiés : <xliff:g id="LIST">%1$s</xliff:g>."</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Les fichiers suivants n\'ont pas été déplacés : <xliff:g id="LIST">%1$s</xliff:g>."</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Ces fichiers ont été convertis dans un autre format : <xliff:g id="LIST">%1$s</xliff:g>."</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fichier a bien été copié dans le Presse-papiers.</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fichiers ont bien été copiés dans le Presse-papiers.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Impossible de coller les fichiers sélectionnés à cet endroit."</string>
<string name="menu_rename" msgid="7678802479104285353">"Renommer"</string>
<string name="rename_error" msgid="4203041674883412606">"Échec du changement de nom du document."</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Certains fichiers ont été convertis"</string>
+ <string name="allow" msgid="7225948811296386551">"Autoriser"</string>
+ <string name="deny" msgid="2081879885755434506">"Refuser"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-gl-rES/strings.xml b/packages/DocumentsUI/res/values-gl-rES/strings.xml
index 5997e3d..7c69698 100644
--- a/packages/DocumentsUI/res/values-gl-rES/strings.xml
+++ b/packages/DocumentsUI/res/values-gl-rES/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Nova ventá"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copiar"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Pegar"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Mostrar almacen. interno"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Mostrar tarxeta SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Ocultar almacen. interno"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ocultar tarxeta SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Mostrar almacen. interno"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Ocultar almacen. interno"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tamaño ficheiro"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tamaño ficheiro"</string>
<string name="button_select" msgid="527196987259139214">"Seleccionar"</string>
@@ -99,10 +97,10 @@
<item quantity="one">Non se puido eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Toca para ver detalles"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Pechar"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Non se copiaron estes ficheiros: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Non se moveron estes ficheiros: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Estes ficheiros convertéronse a outro formato: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">Copiáronse <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros no portapapeis.</item>
<item quantity="one">Copiouse <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro no portapapeis.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Non se poden pegar os ficheiros seleccionados nesta localización."</string>
<string name="menu_rename" msgid="7678802479104285353">"Cambiar nome"</string>
<string name="rename_error" msgid="4203041674883412606">"Non se puido cambiar o nome do documento"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Convertéronse algúns ficheiros"</string>
+ <string name="allow" msgid="7225948811296386551">"Permitir"</string>
+ <string name="deny" msgid="2081879885755434506">"Rexeitar"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-gu-rIN/strings.xml b/packages/DocumentsUI/res/values-gu-rIN/strings.xml
index f013e0f..c650d93 100644
--- a/packages/DocumentsUI/res/values-gu-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-gu-rIN/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"નવી વિંડો"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"કૉપિ કરો"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"પેસ્ટ કરો"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"આંતરિક સ્ટોરેજ બતાવો"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD કાર્ડ બતાવો"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"આંતરિક સંગ્રહ છુપાવો"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD કાર્ડ છુપાવો"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"આંતરિક સ્ટોરેજ બતાવો"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"આંતરિક સંગ્રહ છુપાવો"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"ફાઇલ કદ બતાવો"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"ફાઇલ કદ છુપાવો"</string>
<string name="button_select" msgid="527196987259139214">"પસંદ કરો"</string>
@@ -99,10 +97,10 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલ કાઢી નાખી શક્યાં નથી</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"વિગતો જોવા માટે ટૅપ કરો"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"બંધ કરો"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"આ ફાઇલો કૉપિ કરી નહોતી: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"આ ફાઇલો ખસેડી નહોતી: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"આ ફાઇલો બીજા ફોર્મેટમાં રૂપાંતરિત કરી હતી: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one">ક્લિપબોર્ડ પર <xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલો કૉપિ કરી.</item>
<item quantity="other">ક્લિપબોર્ડ પર <xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલો કૉપિ કરી.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"આ સ્થાનમાં પસંદ કરેલ ફાઇલો પેસ્ટ કરી શકાતી નથી."</string>
<string name="menu_rename" msgid="7678802479104285353">"નામ બદલો"</string>
<string name="rename_error" msgid="4203041674883412606">"દસ્તાવેજનું નામ બદલવામાં નિષ્ફળ થયાં"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"કેટલીક ફાઇલો રૂપાંતરિત કરી હતી"</string>
+ <string name="allow" msgid="7225948811296386551">"મંજૂરી આપો"</string>
+ <string name="deny" msgid="2081879885755434506">"નકારો"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-hi/strings.xml b/packages/DocumentsUI/res/values-hi/strings.xml
index 008995e..4ab246d 100644
--- a/packages/DocumentsUI/res/values-hi/strings.xml
+++ b/packages/DocumentsUI/res/values-hi/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"नई विंडो"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"कॉपी करें"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"चिपकाएं"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"आंतरिक मेमोरी दिखाएं"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD कार्ड दिखाएं"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"आंतरिक मेमोरी छिपाएं"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD कार्ड छिपाएं"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"आंतरिक मेमोरी दिखाएं"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"आंतरिक मेमोरी छिपाएं"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"फ़ाइल आकार दिखाएं"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"फ़ाइल आकार छिपाएं"</string>
<string name="button_select" msgid="527196987259139214">"चुनें"</string>
@@ -99,10 +97,10 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलें हटाई नहीं जा सकीं</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"विवरणों को देखने के लिए टैप करें"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"बंद करें"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"इन फ़ाइलों की कॉपी नहीं बनाई गई: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"ये फ़ाइलें नहीं ले जाई गईं: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"ये फ़ाइलें किसी अन्य प्रारूप में रूपांतरित हो गई थीं: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one">क्लिपबोर्ड पर <xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलों की कॉपी बनाई गई.</item>
<item quantity="other">क्लिपबोर्ड पर <xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलों की कॉपी बनाई गई.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"चयनित फ़ाइलों को इस स्थान में नहीं चिपकाया जा सकता."</string>
<string name="menu_rename" msgid="7678802479104285353">"नाम बदलें"</string>
<string name="rename_error" msgid="4203041674883412606">"दस्तावेज़ का नाम बदलना विफल रहा"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"कुछ फ़ाइलें रूपांतरित हो गई थीं"</string>
+ <string name="allow" msgid="7225948811296386551">"अनुमति दें"</string>
+ <string name="deny" msgid="2081879885755434506">"अस्वीकारें"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-hr/strings.xml b/packages/DocumentsUI/res/values-hr/strings.xml
index d6110a5..e5d04f7 100644
--- a/packages/DocumentsUI/res/values-hr/strings.xml
+++ b/packages/DocumentsUI/res/values-hr/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Novi prozor"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiraj"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Zalijepi"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Pokaži internu pohranu"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Pokaži SD karticu"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Sakrij internu pohranu"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Sakrij SD karticu"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Pokaži internu pohranu"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Sakrij internu pohranu"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Pokaži veličinu datoteke"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Sakrij veličinu datoteke"</string>
<string name="button_select" msgid="527196987259139214">"Odaberi"</string>
@@ -105,10 +103,10 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteka nije izbrisano</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Dodirnite da biste vidjeli pojedinosti"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Zatvori"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Ove datoteke nisu kopirane: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Ove datoteke nisu premještene: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Ove su datoteke konvertirane u neki drugi format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteka kopirana je u međuspremnik.</item>
<item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteke kopirane su u međuspremnik.</item>
@@ -117,4 +115,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Nije moguće zalijepiti odabrane datoteke na ovu lokaciju."</string>
<string name="menu_rename" msgid="7678802479104285353">"Promijeni naziv"</string>
<string name="rename_error" msgid="4203041674883412606">"Naziv dokumenta nije promijenjen"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Neke su datoteke konvertirane"</string>
+ <string name="allow" msgid="7225948811296386551">"Dopusti"</string>
+ <string name="deny" msgid="2081879885755434506">"Odbij"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-hu/strings.xml b/packages/DocumentsUI/res/values-hu/strings.xml
index 139b834..7a68a19 100644
--- a/packages/DocumentsUI/res/values-hu/strings.xml
+++ b/packages/DocumentsUI/res/values-hu/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Új ablak"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Másolás"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Beillesztés"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Belső tárhely"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD-kártya megjelenítése"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Belső tárhely elrejtése"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD-kártya elrejtése"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Belső tárhely"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Belső tárhely elrejtése"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Fájlméret megjelenítése"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Fájlméret elrejtése"</string>
<string name="button_select" msgid="527196987259139214">"Kiválasztás"</string>
@@ -99,10 +97,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fájlt nem sikerült törölni</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Koppintson rá a részletek megtekintéséhez"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Bezárás"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"A következő fájlokat nem sikerült átmásolni: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"A következő fájlok nem lettek áthelyezve: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"A következő fájlokat a rendszer más formátumba konvertálta: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> fájl vágólapra másolva.</item>
<item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> fájl vágólapra másolva.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"A kijelölt fájlokat nem lehet beilleszteni erre a helyre."</string>
<string name="menu_rename" msgid="7678802479104285353">"Átnevezés"</string>
<string name="rename_error" msgid="4203041674883412606">"Nem sikerült átnevezni a dokumentumot"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Egyes fájlokat konvertált a rendszer"</string>
+ <string name="allow" msgid="7225948811296386551">"Engedélyezés"</string>
+ <string name="deny" msgid="2081879885755434506">"Elutasítás"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-hy-rAM/strings.xml b/packages/DocumentsUI/res/values-hy-rAM/strings.xml
index 8fc7e09..e28c711 100644
--- a/packages/DocumentsUI/res/values-hy-rAM/strings.xml
+++ b/packages/DocumentsUI/res/values-hy-rAM/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Նոր պատուհան"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Պատճենել"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Տեղադրել"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Ցույց տալ ներքին պահոցը"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Ցույց տալ SD քարտը"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Թաքցնել ներքին պահոցը"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Թաքցնել SD քարտը"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Ցույց տալ ներքին պահոցը"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Թաքցնել ներքին պահոցը"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Ցույց տալ ֆայլի չափը"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Թաքցնել ֆայլի չափը"</string>
<string name="button_select" msgid="527196987259139214">"Ընտրել"</string>
@@ -99,10 +97,10 @@
<item quantity="other">Չհաջողվեց ջնջել <xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլ</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Հպեք՝ մանրամասները դիտելու համար"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Փակել"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Հետևյալ ֆայլերը չեն պատճենվել՝ <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Հետևյալ ֆայլերը չեն տեղափոխվել՝ <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Այս ֆայլերը փոխարկվել են մեկ այլ ձևաչափի՝ <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլ պատճենվեց սեղմատախտակին:</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլ պատճենվեց սեղմատախտակին:</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Հնարավոր չէ տեղադրել ընտրված ֆայլերը այս տեղադրությունում:"</string>
<string name="menu_rename" msgid="7678802479104285353">"Վերանվանել"</string>
<string name="rename_error" msgid="4203041674883412606">"Չհաջողվեց վերանվանել փաստաթուղթը"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Որոշ ֆայլեր փոխարկվել են"</string>
+ <string name="allow" msgid="7225948811296386551">"Թույլատրել"</string>
+ <string name="deny" msgid="2081879885755434506">"Մերժել"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-in/strings.xml b/packages/DocumentsUI/res/values-in/strings.xml
index 0cb438a..a89d99d 100644
--- a/packages/DocumentsUI/res/values-in/strings.xml
+++ b/packages/DocumentsUI/res/values-in/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Jendela baru"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Salin"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Tempel"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Tampilkan simpanan internal"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Tampilkan kartu SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Sembunyikan simpanan internal"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Sembunyikan kartu SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Tampilkan simpanan internal"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Sembunyikan simpanan internal"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Tampilkan ukuran file"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Sembunyikan ukuran file"</string>
<string name="button_select" msgid="527196987259139214">"Pilih"</string>
@@ -99,10 +97,10 @@
<item quantity="one">Tidak dapat menghapus <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Ketuk untuk melihat detail"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Tutup"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Semua file ini tidak disalin: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Semua file ini tidak dipindahkan: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"File ini dikonversi ke format lain: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> file disalin ke papan klip.</item>
<item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> file disalin ke papan klip.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Tidak dapat menempel file yang dipilih di lokasi ini."</string>
<string name="menu_rename" msgid="7678802479104285353">"Ganti nama"</string>
<string name="rename_error" msgid="4203041674883412606">"Gagal mengganti nama dokumen"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Beberapa file dikonversi"</string>
+ <string name="allow" msgid="7225948811296386551">"Izinkan"</string>
+ <string name="deny" msgid="2081879885755434506">"Tolak"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-is-rIS/strings.xml b/packages/DocumentsUI/res/values-is-rIS/strings.xml
index efd3f7b..9c69741 100644
--- a/packages/DocumentsUI/res/values-is-rIS/strings.xml
+++ b/packages/DocumentsUI/res/values-is-rIS/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Nýr gluggi"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Afrita"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Líma"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Sýna innbyggða geymslu"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Sýna SD-kort"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Fela innbyggða geymslu"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Fela SD-kort"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Sýna innbyggða geymslu"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Fela innbyggða geymslu"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Sýna skráarstærð"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Fela skráarstærð"</string>
<string name="button_select" msgid="527196987259139214">"Velja"</string>
@@ -99,10 +97,10 @@
<item quantity="other">Ekki tókst að eyða <xliff:g id="COUNT_1">%1$d</xliff:g> skrám</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Ýttu til að skoða frekari upplýsingar"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Loka"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Þessar skrár voru ekki afritaðar: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Þessar skrár voru ekki færðar: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Þessum skrám var umbreytt yfir á annað snið: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> skrá afrituð á klippiborð.</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> skrár afritaðar á klippiborð.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Ekki er hægt að vista valdar skrár á þessum stað."</string>
<string name="menu_rename" msgid="7678802479104285353">"Endurnefna"</string>
<string name="rename_error" msgid="4203041674883412606">"Ekki tókst að endurnefna skjalið"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Sumum skrám var umbreytt"</string>
+ <string name="allow" msgid="7225948811296386551">"Leyfa"</string>
+ <string name="deny" msgid="2081879885755434506">"Hafna"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-it/strings.xml b/packages/DocumentsUI/res/values-it/strings.xml
index 1b7506d..d06f732 100644
--- a/packages/DocumentsUI/res/values-it/strings.xml
+++ b/packages/DocumentsUI/res/values-it/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Nuova finestra"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copia"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Incolla"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Mostra memoria interna"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Mostra scheda SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Nascondi memoria interna"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Nascondi scheda SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Mostra memoria interna"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Nascondi memoria interna"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Mostra dimensioni file"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Nascondi dimensioni file"</string>
<string name="button_select" msgid="527196987259139214">"Seleziona"</string>
@@ -99,10 +97,10 @@
<item quantity="one">Impossibile eliminare <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Tocca per vedere i dettagli"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Chiudi"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"I seguenti file non sono stati copiati: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"I seguenti file non sono stati spostati: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"I file sono stati convertiti in un altro formato: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> file copiati negli appunti.</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> file copiato negli appunti.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Impossibile incollare i file selezionati in questa posizione."</string>
<string name="menu_rename" msgid="7678802479104285353">"Rinomina"</string>
<string name="rename_error" msgid="4203041674883412606">"Ridenominazione documento non riuscita"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Alcuni file sono stati convertiti"</string>
+ <string name="allow" msgid="7225948811296386551">"Consenti"</string>
+ <string name="deny" msgid="2081879885755434506">"Nega"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-iw/strings.xml b/packages/DocumentsUI/res/values-iw/strings.xml
index ef966f4..25d9b12 100644
--- a/packages/DocumentsUI/res/values-iw/strings.xml
+++ b/packages/DocumentsUI/res/values-iw/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"חלון חדש"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"העתק"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"הדבק"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"הצג אחסון פנימי"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"הצג כרטיס SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"הסתר אחסון פנימי"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"הסתר כרטיס SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"הצג אחסון פנימי"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"הסתר אחסון פנימי"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"הצג גודל קובץ"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"הסתר גודל קובץ"</string>
<string name="button_select" msgid="527196987259139214">"בחר"</string>
@@ -111,10 +109,10 @@
<item quantity="one">לא ניתן היה למחוק קובץ <xliff:g id="COUNT_0">%1$d</xliff:g></item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"הקש כדי להציג פרטים"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"סגור"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"הקבצים הבאים לא הועתקו: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"הקבצים הבאים לא הועברו: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"הקבצים האלה הומרו לפורמט אחר: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="two"><xliff:g id="COUNT_1">%1$d</xliff:g> קבצים הועתקו אל הלוח.</item>
<item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> קבצים הועתקו אל הלוח.</item>
@@ -124,4 +122,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"לא ניתן להדביק את הקבצים הנבחרים במיקום הזה."</string>
<string name="menu_rename" msgid="7678802479104285353">"שנה שם"</string>
<string name="rename_error" msgid="4203041674883412606">"ניסיון שינוי שם המסמך נכשל"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"קבצים מסוימים הומרו"</string>
+ <string name="allow" msgid="7225948811296386551">"אפשר"</string>
+ <string name="deny" msgid="2081879885755434506">"דחה"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-ja/strings.xml b/packages/DocumentsUI/res/values-ja/strings.xml
index 932e7fc..d1156ff 100644
--- a/packages/DocumentsUI/res/values-ja/strings.xml
+++ b/packages/DocumentsUI/res/values-ja/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"新しいウィンドウ"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"コピー"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"貼り付け"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"内部ストレージを表示"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SDカードを表示"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"内部ストレージを非表示"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SDカードを非表示"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"内部ストレージを表示"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"内部ストレージを非表示"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"ファイルサイズを表示"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"ファイルサイズを非表示"</string>
<string name="button_select" msgid="527196987259139214">"選択"</string>
@@ -99,10 +97,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 個のファイルを削除できませんでした</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"タップすると詳細が表示されます"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"閉じる"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"ファイル（<xliff:g id="LIST">%1$s</xliff:g>）をコピーできませんでした"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"ファイル（<xliff:g id="LIST">%1$s</xliff:g>）を移動できませんでした"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"次のファイルが別の形式に変換されました: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>件のファイルをクリップボードにコピーしました。</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g>件のファイルをクリップボードにコピーしました。</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"選択したファイルをこの場所に貼り付けることはできません。"</string>
<string name="menu_rename" msgid="7678802479104285353">"名前を変更"</string>
<string name="rename_error" msgid="4203041674883412606">"ドキュメントの名前を変更できませんでした"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"一部のファイルが変換されました"</string>
+ <string name="allow" msgid="7225948811296386551">"許可"</string>
+ <string name="deny" msgid="2081879885755434506">"拒否"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-ka-rGE/strings.xml b/packages/DocumentsUI/res/values-ka-rGE/strings.xml
index 370e228..e1a5be4 100644
--- a/packages/DocumentsUI/res/values-ka-rGE/strings.xml
+++ b/packages/DocumentsUI/res/values-ka-rGE/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"ახალი ფანჯარა"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"კოპირება"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"ჩასმა"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"შიდა საცავის ჩვენება"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD ბარათის ჩვენება"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"შიდა მეხსიერების დამალვა"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD ბარათის დამალვა"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"შიდა საცავის ჩვენება"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"შიდა მეხსიერების დამალვა"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"ფაილის ზომის ჩვენება"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"ფაილის ზომის დამალვა"</string>
<string name="button_select" msgid="527196987259139214">"არჩევა"</string>
@@ -99,10 +97,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ფაილი ვერ წაიშალა</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"შეეხეთ დეტალების სანახავად"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"დახურვა"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"ეს ფაილები არ იყო გადაწერილი: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"ეს ფაილები ვერ გადაადგილდა: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"შემდეგი ფაილები გარდაქმნილია სხვა ფორმატში: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">მოხდა <xliff:g id="COUNT_1">%1$d</xliff:g> ფაილის გაცვლის ბუფერში კოპირება.</item>
<item quantity="one">მოხდა <xliff:g id="COUNT_0">%1$d</xliff:g> ფაილის გაცვლის ბუფერში კოპირება.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"ამ მდებარეობაში შერჩეული ფაილების ჩასმა შეუძლებელია."</string>
<string name="menu_rename" msgid="7678802479104285353">"გადარქმევა"</string>
<string name="rename_error" msgid="4203041674883412606">"დოკუმენტის გადარქმევა ვერ მოხერხდა"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ზოგიერთი ფაილი გარდაქმნილია"</string>
+ <string name="allow" msgid="7225948811296386551">"უფლების მიცემა"</string>
+ <string name="deny" msgid="2081879885755434506">"აკრძალვა"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-kk-rKZ/strings.xml b/packages/DocumentsUI/res/values-kk-rKZ/strings.xml
index bea34c7..3aed2a0 100644
--- a/packages/DocumentsUI/res/values-kk-rKZ/strings.xml
+++ b/packages/DocumentsUI/res/values-kk-rKZ/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Жаңа терезе"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Көшіру"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Қою"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Ішкі жадты көрсету"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD картасын көрсету"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Ішкі жадты жасыру"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD картасын жасыру"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Ішкі жадты көрсету"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Ішкі жадты жасыру"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Файл өлшемін көрсету"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Файл өлшемін жасыру"</string>
<string name="button_select" msgid="527196987259139214">"Таңдау"</string>
@@ -99,10 +97,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файлды жою мүмкін болмады</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Мәліметтерді көру үшін түртіңіз"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Жабу"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Мына файлдар көшірілген жоқ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Мына файлдар тасымалданған жоқ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Мына файлдар басқа пішімге түрлендірілді: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">Аралық сақтағышқа <xliff:g id="COUNT_1">%1$d</xliff:g> файл көшірілді.</item>
<item quantity="one">Аралық сақтағышқа <xliff:g id="COUNT_0">%1$d</xliff:g> файл көшірілді.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Таңдалған файлдарды бұл орынға қою мүмкін емес."</string>
<string name="menu_rename" msgid="7678802479104285353">"Атын өзгерту"</string>
<string name="rename_error" msgid="4203041674883412606">"Құжат қайта аталмады"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Кейбір файлдар түрлендірілді"</string>
+ <string name="allow" msgid="7225948811296386551">"Рұқсат беру"</string>
+ <string name="deny" msgid="2081879885755434506">"Бас тарту"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-km-rKH/strings.xml b/packages/DocumentsUI/res/values-km-rKH/strings.xml
index 31b8816..7e5851f 100644
--- a/packages/DocumentsUI/res/values-km-rKH/strings.xml
+++ b/packages/DocumentsUI/res/values-km-rKH/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"បង្អួចថ្មី"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"ចម្លង"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"បិទភ្ជាប់"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"បង្ហាញឧបករណ៍ផ្ទុកខាងក្នុង"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"បង្ហាញកាតអេសឌី"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"លាក់ឧបករណ៍ផ្ទុកខាងក្នុង"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"លាក់កាតអេសឌី"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"បង្ហាញឧបករណ៍ផ្ទុកខាងក្នុង"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"លាក់ឧបករណ៍ផ្ទុកខាងក្នុង"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"បង្ហាញទំហំឯកសារ"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"លាក់ទំហំឯកសារ"</string>
<string name="button_select" msgid="527196987259139214">"ជ្រើស"</string>
@@ -99,10 +97,10 @@
<item quantity="one">មិនអាចលុបឯកសារ <xliff:g id="COUNT_0">%1$d</xliff:g> បានទេ</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"ប៉ះដើម្បីមើលព័ត៌មានលម្អិត"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"បិទ"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"ឯកសារទាំងនេះមិនបានចម្លងទេ៖ <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"ឯកសារទាំងនេះមិនអាចផ្លាស់ទីបានទេ៖ <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"ឯកសារទាំងនេះត្រូវបានបម្លែងទៅជាទម្រង់ផ្សេង៖ <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">បានចម្លងឯកសារ <xliff:g id="COUNT_1">%1$d</xliff:g> ទៅតម្បៀតខ្ទាស់។</item>
<item quantity="one">បានចម្លងឯកសារ <xliff:g id="COUNT_0">%1$d</xliff:g> ទៅតម្បៀតខ្ទាស់។</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"មិនអាចបិទភ្ជាប់ឯកសារដែលបានជ្រើសនៅក្នុងទីតាំងនេះបានទេ។"</string>
<string name="menu_rename" msgid="7678802479104285353">"ប្ដូរឈ្មោះ"</string>
<string name="rename_error" msgid="4203041674883412606">"បានបរាជ័យក្នុងការប្តូរឈ្មោះឯកសារ"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ឯកសារមួយចំនួនត្រូវបានបម្លែង"</string>
+ <string name="allow" msgid="7225948811296386551">"អនុញ្ញាត"</string>
+ <string name="deny" msgid="2081879885755434506">"បដិសេធ"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-kn-rIN/strings.xml b/packages/DocumentsUI/res/values-kn-rIN/strings.xml
index ab4e90b..41cdbc3 100644
--- a/packages/DocumentsUI/res/values-kn-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-kn-rIN/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"ಹೊಸ ವಿಂಡೋ"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"ನಕಲಿಸು"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"ಅಂಟಿಸು"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯನ್ನು ತೋರಿಸು"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD ಕಾಡ್ ಅನ್ನು ತೋರಿಸು"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯನ್ನು ಮರೆಮಾಡಿ"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD ಕಾರ್ಡ್ ಅನ್ನು ಮರೆಮಾಡಿ"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯನ್ನು ತೋರಿಸು"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯನ್ನು ಮರೆಮಾಡಿ"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"ಫೈಲ್ ಗಾತ್ರವನ್ನು ತೋರಿಸು"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"ಫೈಲ್ ಗಾತ್ರವನ್ನು ಮರೆಮಾಡಿ"</string>
<string name="button_select" msgid="527196987259139214">"ಆಯ್ಕೆಮಾಡು"</string>
@@ -99,10 +97,10 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"ವಿವರಗಳನ್ನು ವೀಕ್ಷಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"ಮುಚ್ಚು"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"ಈ ಫೈಲ್ಗಳನ್ನು ನಕಲು ಮಾಡಿಲ್ಲ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"ಈ ಫೈಲ್ಗಳನ್ನು ಸರಿಸಲಾಗಿಲ್ಲ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"ಈ ಫೈಲ್ಗಳನ್ನು ಮತ್ತೊಂದು ಫಾರ್ಮೆಟ್ಗೆ ಪರಿವರ್ತಿಸಲಾಗಿತ್ತು: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one">ಕ್ಲಿಪ್ಬೋರ್ಡ್ಗೆ <xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ನಕಲಿಸಲಾಗಿದೆ.</item>
<item quantity="other">ಕ್ಲಿಪ್ಬೋರ್ಡ್ಗೆ <xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ನಕಲಿಸಲಾಗಿದೆ.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"ಈ ಸ್ಥಳದಲ್ಲಿ ಆಯ್ಕೆಮಾಡಿದ ಫೈಲ್ಗಳನ್ನು ಅಂಟಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
<string name="menu_rename" msgid="7678802479104285353">"ಮರುಹೆಸರಿಸು"</string>
<string name="rename_error" msgid="4203041674883412606">"ಡಾಕ್ಯುಮೆಂಟ್ ಮರುಹೆಸರಿಸಲು ವಿಫಲವಾಗಿದೆ"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ಕೆಲವು ಫೈಲ್ಗಳನ್ನು ಪರಿವರ್ತಿಸಲಾಗಿದೆ"</string>
+ <string name="allow" msgid="7225948811296386551">"ಅನುಮತಿಸು"</string>
+ <string name="deny" msgid="2081879885755434506">"ನಿರಾಕರಿಸು"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-ko/strings.xml b/packages/DocumentsUI/res/values-ko/strings.xml
index 9bb596d..58edec4 100644
--- a/packages/DocumentsUI/res/values-ko/strings.xml
+++ b/packages/DocumentsUI/res/values-ko/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"새 창"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"복사"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"붙여넣기"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"내부 저장소 표시"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD 카드 표시"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"내부 저장소 숨기기"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD 카드 숨기기"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"내부 저장소 표시"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"내부 저장소 숨기기"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"파일 크기 표시"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"파일 크기 숨기기"</string>
<string name="button_select" msgid="527196987259139214">"선택"</string>
@@ -99,10 +97,10 @@
<item quantity="one">파일 <xliff:g id="COUNT_0">%1$d</xliff:g>개를 삭제할 수 없습니다.</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"세부정보를 보려면 탭하세요."</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"닫기"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"다음 파일이 복사되지 않았습니다. <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"다음 파일이 이동되지 않았습니다. <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"파일이 다음과 같이 다른 형식으로 변환되었습니다. <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">파일 <xliff:g id="COUNT_1">%1$d</xliff:g>개를 클립보드에 복사함</item>
<item quantity="one">파일 <xliff:g id="COUNT_0">%1$d</xliff:g>개를 클립보드에 복사함</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"선택한 파일을 이 위치에 붙여넣을 수 없습니다."</string>
<string name="menu_rename" msgid="7678802479104285353">"이름 바꾸기"</string>
<string name="rename_error" msgid="4203041674883412606">"문서 이름을 변경하지 못했습니다."</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"일부 파일이 변환되었습니다."</string>
+ <string name="allow" msgid="7225948811296386551">"허용"</string>
+ <string name="deny" msgid="2081879885755434506">"거부"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-ky-rKG/strings.xml b/packages/DocumentsUI/res/values-ky-rKG/strings.xml
index c29fc45..fc56478 100644
--- a/packages/DocumentsUI/res/values-ky-rKG/strings.xml
+++ b/packages/DocumentsUI/res/values-ky-rKG/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Жаңы терезе"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Көчүрүү"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Чаптоо"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Ички сактагычты көрсөтүү"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD картаны көрсөтүү"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Ички эстутумду жашыруу"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD картаны жашыруу"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Ички сактагычты көрсөтүү"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Ички эстутумду жашыруу"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Файл өлчөмүн көрсөтүү"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Файл өлчөмүн жашыруу"</string>
<string name="button_select" msgid="527196987259139214">"Тандоо"</string>
@@ -99,10 +97,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файл жок кылынбай койду</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Чоо-жайын көрүү үчүн таптаңыз"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Жабуу"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Төмөнкү файлдар көчүрүлгөн жок: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Төмөнкү файлдар жылдырылган жок: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Бул файлдар башка форматка айландырылды: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файл буферге көчүрүлдү.</item>
<item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> файл буферге көчүрүлдү.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Тандалган файлдарды бул жерге чаптоого мүмкүн эмес."</string>
<string name="menu_rename" msgid="7678802479104285353">"Аталышын өзгөртүү"</string>
<string name="rename_error" msgid="4203041674883412606">"Документтин аталышы өзгөртүлбөй калды"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Айрым файлдардын форматы өзгөртүлдү"</string>
+ <string name="allow" msgid="7225948811296386551">"Уруксат берүү"</string>
+ <string name="deny" msgid="2081879885755434506">"Жок"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-lo-rLA/strings.xml b/packages/DocumentsUI/res/values-lo-rLA/strings.xml
index 223adae..fba9244 100644
--- a/packages/DocumentsUI/res/values-lo-rLA/strings.xml
+++ b/packages/DocumentsUI/res/values-lo-rLA/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"ໜ້າຈໍໃໝ່"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"ສຳເນົາ"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"ວາງໃສ່"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"ສະແດງໂຕເກັບຂໍ້ມູນພາຍໃນ"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"ສະແດງ SD Card"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"ເຊື່ອງໂຕເກັບຂໍ້ມູນພາຍໃນ"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"ເຊື່ອງ SD Card"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"ສະແດງໂຕເກັບຂໍ້ມູນພາຍໃນ"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"ເຊື່ອງໂຕເກັບຂໍ້ມູນພາຍໃນ"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"ສະແດງຂະໜາດໄຟລ໌"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"ເຊື່ອງຂະຫນາດໄຟລ໌"</string>
<string name="button_select" msgid="527196987259139214">"ເລືອກ"</string>
@@ -99,10 +97,10 @@
<item quantity="one">ບໍ່ສາມາດລຶບ <xliff:g id="COUNT_0">%1$d</xliff:g> ໄຟລ໌</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"ແຕະເພື່ອເບິ່ງລາຍລະອຽດ"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"ປິດ"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"ໄຟລ໌ເຫຼົ່ານີ້ບໍ່ຖືກອັດສຳເນົາ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"ໄຟລ໌ເຫຼົ່ານີ້ບໍ່ຖືກຍ້າຍ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"ໄຟລ໌ເຫຼົ່ານີ້ໄດ້ຖືກປ່ຽນເປັນຮູບແບບອື່ນແລ້ວ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">ອັດສຳເນົາ <xliff:g id="COUNT_1">%1$d</xliff:g> ໄຟລ໌ໃສ່ຄລິບບອດແລ້ວ.</item>
<item quantity="one">ອັດສຳເນົາ <xliff:g id="COUNT_0">%1$d</xliff:g> ໄຟລ໌ໃສ່ຄລິບບອດແລ້ວ.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"ບໍ່ສາມາດແປະໄຟລ໌ເລືອກໄວ້ຢູ່ໃນທີ່ຕັ້ງນີ້ໄດ້."</string>
<string name="menu_rename" msgid="7678802479104285353">"ປ່ຽນຊື່"</string>
<string name="rename_error" msgid="4203041674883412606">"ປ່ຽນຊື່ເອກະສານບໍ່ສຳເລັດ"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ປ່ຽນແປງບາງໄຟລ໌ແລ້ວ"</string>
+ <string name="allow" msgid="7225948811296386551">"ອະນຸຍາດ"</string>
+ <string name="deny" msgid="2081879885755434506">"ປະຕິເສດ"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-lt/strings.xml b/packages/DocumentsUI/res/values-lt/strings.xml
index 8993ffa..992d4da 100644
--- a/packages/DocumentsUI/res/values-lt/strings.xml
+++ b/packages/DocumentsUI/res/values-lt/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Naujas langas"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopijuoti"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Įklijuoti"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Rodyti vidinę atmintį"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Rodyti SD kortelę"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Slėpti vidinę atmintį"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Slėpti SD kortelę"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Rodyti vidinę atmintį"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Slėpti vidinę atmintį"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Rodyti failo dydį"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Slėpti failo dydį"</string>
<string name="button_select" msgid="527196987259139214">"Pasirinkti"</string>
@@ -111,10 +109,10 @@
<item quantity="other">Nepavyko ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> failų</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Palieskite, kad peržiūrėtumėte informaciją"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Uždaryti"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Šie failai nenukopijuoti: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Šie failai nebuvo perkelti: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Šie failai konvertuoti į kitą formatą: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one">Nukopijuotas <xliff:g id="COUNT_1">%1$d</xliff:g> failas į iškarpinę.</item>
<item quantity="few">Nukopijuoti <xliff:g id="COUNT_1">%1$d</xliff:g> failai į iškarpinę.</item>
@@ -124,4 +122,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Nepavyko įklijuoti pasirinktų failų šioje vietoje."</string>
<string name="menu_rename" msgid="7678802479104285353">"Pervardyti"</string>
<string name="rename_error" msgid="4203041674883412606">"Nepavyko pervardyti dokumento"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Kai kurie failai buvo konvertuoti"</string>
+ <string name="allow" msgid="7225948811296386551">"Leisti"</string>
+ <string name="deny" msgid="2081879885755434506">"Atmesti"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-lv/strings.xml b/packages/DocumentsUI/res/values-lv/strings.xml
index 6544834..58e507d 100644
--- a/packages/DocumentsUI/res/values-lv/strings.xml
+++ b/packages/DocumentsUI/res/values-lv/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Jauns logs"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopēt"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Ielīmēt"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Rādīt iekšējo atmiņu"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Rādīt SD karti"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Paslēpt iekšējo atmiņu"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Paslēpt SD karti"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Rādīt iekšējo atmiņu"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Paslēpt iekšējo atmiņu"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Rādīt failu lielumu"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Paslēpt failu lielumu"</string>
<string name="button_select" msgid="527196987259139214">"Atlasīt"</string>
@@ -105,10 +103,10 @@
<item quantity="other">Nevarēja izdzēst <xliff:g id="COUNT_1">%1$d</xliff:g> failus.</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Pieskarieties, lai skatītu informāciju"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Aizvērt"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Netika nokopēti šādi faili: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Šie faili netika pārvietoti: <xliff:g id="LIST">%1$s</xliff:g>."</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Šie faili tika pārveidoti citā formātā: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="zero"><xliff:g id="COUNT_1">%1$d</xliff:g> faili tika kopēti starpliktuvē.</item>
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fails tika kopēts starpliktuvē.</item>
@@ -117,4 +115,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Atlasītos failus šeit nevar ielīmēt."</string>
<string name="menu_rename" msgid="7678802479104285353">"Pārdēvēt"</string>
<string name="rename_error" msgid="4203041674883412606">"Neizdevās pārdēvēt dokumentu"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Daži faili tika pārveidoti."</string>
+ <string name="allow" msgid="7225948811296386551">"Atļaut"</string>
+ <string name="deny" msgid="2081879885755434506">"Noraidīt"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-mk-rMK/strings.xml b/packages/DocumentsUI/res/values-mk-rMK/strings.xml
index ec2ab82..b1ea307 100644
--- a/packages/DocumentsUI/res/values-mk-rMK/strings.xml
+++ b/packages/DocumentsUI/res/values-mk-rMK/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Нов прозорец"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Копирај"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Залепи"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Прикажи внатрешна мемор."</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Прикажи СД-картичка"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Скриј внатрешна меморија"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Сoкриј СД-картичка"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Прикажи внатрешна мемор."</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Скриј внатрешна меморија"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Прикажи целосна големина"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Сокриј целосна големина"</string>
<string name="button_select" msgid="527196987259139214">"Избери"</string>
@@ -99,10 +97,10 @@
<item quantity="other">Не можеше да се избришат <xliff:g id="COUNT_1">%1$d</xliff:g> датотеки</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Допрете за да ги погледнете деталите"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Затвори"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Датотекиве не се ископирани: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Овие датотеки не се преместија: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Овие датотеки беа конвертирани во друг формат: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one">Копирана е <xliff:g id="COUNT_1">%1$d</xliff:g> датотека на таблата со исечоци.</item>
<item quantity="other">Копирани се <xliff:g id="COUNT_1">%1$d</xliff:g> датотеки на таблата со исечоци.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Не може да ги залепи избраните датотеки на локацијава."</string>
<string name="menu_rename" msgid="7678802479104285353">"Преименувај"</string>
<string name="rename_error" msgid="4203041674883412606">"Не успеа да се преименува документот"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Некои датотеки беа конвертирани"</string>
+ <string name="allow" msgid="7225948811296386551">"Дозволи"</string>
+ <string name="deny" msgid="2081879885755434506">"Одбиј"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-ml-rIN/strings.xml b/packages/DocumentsUI/res/values-ml-rIN/strings.xml
index 6e23f6c..9d1f353 100644
--- a/packages/DocumentsUI/res/values-ml-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-ml-rIN/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"പുതിയ വിന്ഡോ"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"പകര്ത്തുക"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"ഒട്ടിക്കുക"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"ആന്തരിക സ്റ്റോറേജ് കാണിക്കുക"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD കാർഡ് കാണിക്കുക"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"ആന്തരിക സ്റ്റോറേജ് മറയ്ക്കുക"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD കാർഡ് മറയ്ക്കുക"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"ആന്തരിക സ്റ്റോറേജ് കാണിക്കുക"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"ആന്തരിക സ്റ്റോറേജ് മറയ്ക്കുക"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"ഫയൽ വലുപ്പം കാണിക്കുക"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"ഫയൽ വലുപ്പം മറയ്ക്കുക"</string>
<string name="button_select" msgid="527196987259139214">"തിരഞ്ഞെടുക്കുക"</string>
@@ -99,10 +97,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ഫയൽ ഇല്ലാതാക്കാൻ കഴിഞ്ഞില്ല</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"വിശദാംശങ്ങൾ കാണുന്നതിന് ടാപ്പുചെയ്യുക"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"അടയ്ക്കുക"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"ഈ ഫയലുകൾ പകർത്താനായില്ല: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"ഈ ഫയലുകളെ നീക്കിയില്ല: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"ഈ ഫയലുകൾ മറ്റൊരു ഫോർമാറ്റിലേക്ക് പരിവർത്തനം ചെയ്യപ്പെട്ടു: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ഫയലുകൾ ക്ലിപ്പ്ബോർഡിലേക്ക് പകർത്തി.</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ഫയൽ ക്ലിപ്പ്ബോർഡിലേക്ക് പകർത്തി.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"തിരഞ്ഞെടുത്ത ഫയലുകൾ ഈ ലൊക്കേഷനിൽ ഒട്ടിക്കാനാകുന്നില്ല."</string>
<string name="menu_rename" msgid="7678802479104285353">"പേരുമാറ്റുക"</string>
<string name="rename_error" msgid="4203041674883412606">"ഡോക്യുമെന്റിന്റെ പേരുമാറ്റുന്നത് പരാജയപ്പെട്ടു"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ചില ഫയലുകൾ പരിവർത്തനം ചെയ്യപ്പെട്ടു"</string>
+ <string name="allow" msgid="7225948811296386551">"അനുവദിക്കുക"</string>
+ <string name="deny" msgid="2081879885755434506">"നിരസിക്കുക"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-mn-rMN/strings.xml b/packages/DocumentsUI/res/values-mn-rMN/strings.xml
index 137d5eb..3cbdc55 100644
--- a/packages/DocumentsUI/res/values-mn-rMN/strings.xml
+++ b/packages/DocumentsUI/res/values-mn-rMN/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Шинэ цонх"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Хуулах"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Буулгах"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Дотоод санг харуулах"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD картыг харуулах"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Дотоод санг нуух"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD картыг нуух"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Дотоод санг харуулах"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Дотоод санг нуух"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Файлын хэмжээг харуулах"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Файлын хэмжээг нуух"</string>
<string name="button_select" msgid="527196987259139214">"Сонгох"</string>
@@ -99,10 +97,10 @@
<item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> файлыг устгаж чадсангүй</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Дэлгэрэнгүй мэдээллийг үзэхийн тулд дарна уу"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Хаах"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Дараах файлуудыг хуулаагүй: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Эдгээр файлыг зөөвөрлөөгүй байна: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Эдгээр файлыг өөр хэлбэршилтэд хөрвүүлсэн байна: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> материалыг түр санах ой руу хуулсан.</item>
<item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> материалыг түр санах ой руу хуулсан.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Энэ байршилд сонгосон файлыг байршуулах боломжгүй байна."</string>
<string name="menu_rename" msgid="7678802479104285353">"Нэр өөрчлөх"</string>
<string name="rename_error" msgid="4203041674883412606">"Баримт бичгийн нэрийн өөрчилж чадсангүй"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Зарим файлыг хөрвүүлсэн"</string>
+ <string name="allow" msgid="7225948811296386551">"Зөвшөөрөх"</string>
+ <string name="deny" msgid="2081879885755434506">"Татгалзах"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-mr-rIN/strings.xml b/packages/DocumentsUI/res/values-mr-rIN/strings.xml
index babb452..ae7a48a 100644
--- a/packages/DocumentsUI/res/values-mr-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-mr-rIN/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"नवीन विंडो"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"कॉपी करा"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"पेस्ट करा"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"अंतर्गत संचयन दर्शवा"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD कार्ड दर्शवा"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"अंतर्गत संचयन लपवा"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD कार्ड लपवा"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"अंतर्गत संचयन दर्शवा"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"अंतर्गत संचयन लपवा"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"फाईल आकार दर्शवा"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"फाईल आकार लपवा"</string>
<string name="button_select" msgid="527196987259139214">"निवडा"</string>
@@ -99,10 +97,10 @@
<item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> फायली हटविणे शक्य झाले नाही</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"तपशील पाहण्यासाठी टॅप करा"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"बंद करा"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"या फायली कॉपी झाल्या नाहीत: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"या फायली हलविल्या नव्हत्या: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"या फायली दुसर्या स्वरूपनात रूपांतरित केल्या होत्या: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one">क्लिपबोर्डवर <xliff:g id="COUNT_1">%1$d</xliff:g> फाईल कॉपी केली.</item>
<item quantity="other">क्लिपबोर्डवर <xliff:g id="COUNT_1">%1$d</xliff:g> फायली कॉपी केल्या.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"या स्थानामध्ये निवडलेल्या फायली पेस्ट करू शकत नाही."</string>
<string name="menu_rename" msgid="7678802479104285353">"पुनर्नामित करा"</string>
<string name="rename_error" msgid="4203041674883412606">"दस्तऐवज पुनर्नामित करण्यात अयशस्वी झाले"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"काही फायली रूपांतरित केल्या होत्या"</string>
+ <string name="allow" msgid="7225948811296386551">"अनुमती द्या"</string>
+ <string name="deny" msgid="2081879885755434506">"नकार द्या"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-ms-rMY/strings.xml b/packages/DocumentsUI/res/values-ms-rMY/strings.xml
index 5d0dbdf..7346dd5 100644
--- a/packages/DocumentsUI/res/values-ms-rMY/strings.xml
+++ b/packages/DocumentsUI/res/values-ms-rMY/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Tetingkap baharu"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Salin"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Tampal"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Papar storan dalaman"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Papar kad SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Sembunyikan storan dlmn"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Sembunyikan kad SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Papar storan dalaman"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Sembunyikan storan dlmn"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Papar saiz fail"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Sembunyikan saiz fail"</string>
<string name="button_select" msgid="527196987259139214">"Pilih"</string>
@@ -99,10 +97,10 @@
<item quantity="one">Tidak dapat memadamkan <xliff:g id="COUNT_0">%1$d</xliff:g> fail</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Ketik untuk melihat butiran"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Tutup"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Fail ini tidak disalin: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Fail ini tidak dialihkan: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Fail ini telah ditukarkan kepada format lain: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fail disalin ke papan keratan.</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fail disalin ke papan keratan.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Tidak boleh menampalkan fail yang dipilih dalam lokasi ini."</string>
<string name="menu_rename" msgid="7678802479104285353">"Namakan semula"</string>
<string name="rename_error" msgid="4203041674883412606">"Gagal menamakan semula dokumen"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Sesetengah fail telah ditukarkan"</string>
+ <string name="allow" msgid="7225948811296386551">"Benarkan"</string>
+ <string name="deny" msgid="2081879885755434506">"Nafi"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-my-rMM/strings.xml b/packages/DocumentsUI/res/values-my-rMM/strings.xml
index 0621d44..2e71299 100644
--- a/packages/DocumentsUI/res/values-my-rMM/strings.xml
+++ b/packages/DocumentsUI/res/values-my-rMM/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"ဝင်းဒိုးသစ်"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"ကူးယူရန်"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"ကပ်ရန်"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"စက်ရှိစတိုရုံ ပြပါ"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD ကဒ် ပြပါ"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"စက်ရှိစတိုရုံ ဖျောက်ထားပါ"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD ကဒ် ဖျောက်ပါ"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"စက်ရှိစတိုရုံ ပြပါ"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"စက်ရှိစတိုရုံ ဖျောက်ထားပါ"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"ဖိုင်အရွယ်အစား ပြပါ"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"ဖိုင်အရွယ်အစား ဖျောက်ပါ"</string>
<string name="button_select" msgid="527196987259139214">"ရွေးရန်"</string>
@@ -99,10 +97,10 @@
<item quantity="one">ဖိုင် <xliff:g id="COUNT_0">%1$d</xliff:g> ခုကိုဖျက်၍မရပါ</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"အသေးစိတ်ကြည့်ရန် တို့ပါ"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"ပိတ်ပါ"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"ဤဖိုင်များ ကော်ပီကူးမထားပါ- <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"ဤဖိုင်များကို မရွှေ့ခဲ့ပါ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"ဤဖိုင်များကို အခြားပုံစံစနစ်တစ်ခုသို့ ပြောင်းလဲခဲ့သည် − <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"> ဖိုင် <xliff:g id="COUNT_1">%1$d</xliff:g> ဖိုင်ကိုအချက်အလက်သိမ်းတဲ့နေရာသို့ ကူးယူပါ။</item>
<item quantity="one"> ဖိုင် <xliff:g id="COUNT_0">%1$d</xliff:g> ဖိုင်ကိုအချက်အလက်သိမ်းတဲ့နေရာသို့ ကူးယူပါ။</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"ဤနေရာတွင် ရွေးချယ်ထားသည့် ဖိုင်များကို ကူးထည့်၍မရပါ။"</string>
<string name="menu_rename" msgid="7678802479104285353">"အမည်ပြောင်းရန်"</string>
<string name="rename_error" msgid="4203041674883412606">"စာရွက်စာတမ်းကို အမည်ပြောင်းခြင်း မအောင်မြင်ပါ"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"အချို့ဖိုင်များကို ပြောင်းလဲထားသည်"</string>
+ <string name="allow" msgid="7225948811296386551">"ခွင့်ပြုသည်"</string>
+ <string name="deny" msgid="2081879885755434506">"ငြင်းပယ်သည်"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-nb/strings.xml b/packages/DocumentsUI/res/values-nb/strings.xml
index c4a8e2a..57a5a76 100644
--- a/packages/DocumentsUI/res/values-nb/strings.xml
+++ b/packages/DocumentsUI/res/values-nb/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Nytt vindu"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiér"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Lim inn"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Vis den interne lagringen"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Vis SD-kortet"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Skjul den interne lagringen"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Skjul SD-kortet"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Vis den interne lagringen"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Skjul den interne lagringen"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Vis filstørrelsen"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Skjul filstørrelsen"</string>
<string name="button_select" msgid="527196987259139214">"Velg"</string>
@@ -99,10 +97,10 @@
<item quantity="one">Kunne ikke slette <xliff:g id="COUNT_0">%1$d</xliff:g> fil</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Trykk for å se detaljer"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Lukk"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Disse filene ble ikke kopiert: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Disse filene ble ikke flyttet: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Disse filene er konvertert til et annet format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">Kopierte <xliff:g id="COUNT_1">%1$d</xliff:g> filer til utklippstavlen.</item>
<item quantity="one">Kopierte <xliff:g id="COUNT_0">%1$d</xliff:g> fil til utklippstavlen.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Kan ikke lime inn de valgte filene her."</string>
<string name="menu_rename" msgid="7678802479104285353">"Gi nytt navn"</string>
<string name="rename_error" msgid="4203041674883412606">"Kunne ikke gi dokumentet nytt navn"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Noen filer er konvertert"</string>
+ <string name="allow" msgid="7225948811296386551">"Tillat"</string>
+ <string name="deny" msgid="2081879885755434506">"Avslå"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-ne-rNP/strings.xml b/packages/DocumentsUI/res/values-ne-rNP/strings.xml
index a40edc7..1f2f29c 100644
--- a/packages/DocumentsUI/res/values-ne-rNP/strings.xml
+++ b/packages/DocumentsUI/res/values-ne-rNP/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"नयाँ विन्डो"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"प्रतिलिपि बनाउनुहोस्"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"टाँस्नुहोस्"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"आन्तरिक भण्डारण देखाउनुहोस्"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD कार्ड देखाउनुहोस्"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"आन्तरिक भण्डारण लुकाउनुहोस्"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD कार्ड लुकाउनुहोस्"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"आन्तरिक भण्डारण देखाउनुहोस्"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"आन्तरिक भण्डारण लुकाउनुहोस्"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"फाइल आकार देखाउनुहोस्"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"फाइल आकार लुकाउनुहोस्"</string>
<string name="button_select" msgid="527196987259139214">"चयन गर्नुहोस्"</string>
@@ -99,10 +97,10 @@
<item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> फाइल मेट्न सकेन</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"विवरणहरू हेर्न ट्याप गर्नुहोस्"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"बन्द गर्नुहोस्"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"यी फाइलहरू प्रतिलिपि गरिएको थिएनः <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"यी फाइलहरू सारिएनन्: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"यी फाइलहरू अर्को ढाँचामा परिणत गरिएका थिए: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"> क्लिपबोर्डमा <xliff:g id="COUNT_1">%1$d</xliff:g> फाइलहरू प्रतिलिपि बनाइए।</item>
<item quantity="one"> क्लिपबोर्डमा <xliff:g id="COUNT_0">%1$d</xliff:g> फाइलहरूका प्रतिलिपि बनाइए।</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"यो स्थानमा चयन गरिएका फाइलहरू टाँस्न सकिँदैन।"</string>
<string name="menu_rename" msgid="7678802479104285353">"पुन: नामाकरण गर्नुहोस्"</string>
<string name="rename_error" msgid="4203041674883412606">"कागजात पुन: नामाकरण गर्न असफल भयो"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"केही फाइलहरू परिवर्तन गरिएका थिए"</string>
+ <string name="allow" msgid="7225948811296386551">"अनुमति दिनुहोस्"</string>
+ <string name="deny" msgid="2081879885755434506">"अस्वीकार गर्नुहोस्"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-nl/strings.xml b/packages/DocumentsUI/res/values-nl/strings.xml
index eecc871..348c9cf 100644
--- a/packages/DocumentsUI/res/values-nl/strings.xml
+++ b/packages/DocumentsUI/res/values-nl/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Nieuw venster"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiëren"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Plakken"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Interne opslag weergeven"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD-kaart weergeven"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Interne opslag verbergen"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD-kaart verbergen"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Interne opslag weergeven"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Interne opslag verbergen"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Bestandsgrootte weergeven"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Bestandsgrootte verbergen"</string>
<string name="button_select" msgid="527196987259139214">"Selecteren"</string>
@@ -99,10 +97,10 @@
<item quantity="one">Kan <xliff:g id="COUNT_0">%1$d</xliff:g> bestand niet verwijderen</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Tik om details te bekijken"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Sluiten"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Deze bestanden zijn niet gekopieerd: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Deze bestanden zijn niet verplaatst: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Deze bestanden zijn geconverteerd vanuit een andere indeling: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> bestanden gekopieerd naar klembord.</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> bestand gekopieerd naar klembord.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Kan de geselecteerde bestanden niet plakken op deze locatie."</string>
<string name="menu_rename" msgid="7678802479104285353">"Naam wijzigen"</string>
<string name="rename_error" msgid="4203041674883412606">"Kan naam van document niet wijzigen"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Sommige bestanden zijn geconverteerd"</string>
+ <string name="allow" msgid="7225948811296386551">"Toestaan"</string>
+ <string name="deny" msgid="2081879885755434506">"Weigeren"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-pa-rIN/strings.xml b/packages/DocumentsUI/res/values-pa-rIN/strings.xml
index 075ca4d..add268f 100644
--- a/packages/DocumentsUI/res/values-pa-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-pa-rIN/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"ਨਵੀਂ ਵਿੰਡੋ"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"ਕਾਪੀ ਕਰੋ"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"ਪੇਸਟ ਕਰੋ"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ ਦਿਖਾਓ"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD ਕਾਰਡ ਦਿਖਾਓ"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ ਲੁਕਾਓ"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD ਕਾਰਡ ਲੁਕਾਓ"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ ਦਿਖਾਓ"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ ਲੁਕਾਓ"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"ਫਾਈਲ ਆਕਾਰ ਦਿਖਾਓ"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"ਫਾਈਲ ਆਕਾਰ ਲੁਕਾਓ"</string>
<string name="button_select" msgid="527196987259139214">"ਚੁਣੋ"</string>
@@ -99,10 +97,10 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਨੂੰ ਮਿਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"ਵੇਰਵਿਆਂ ਨੂੰ ਵੇਖਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"ਬੰਦ ਕਰੋ"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"ਇਹਨਾਂ ਫ਼ਾਈਲਾਂ ਦੀ ਪ੍ਰਤੀਲਿਪੀ ਨਹੀਂ ਬਣਾਈ ਗਈ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"ਇਹਨਾਂ ਫ਼ਾਈਲਾਂ ਨੂੰ ਮੂਵ ਨਹੀਂ ਕੀਤਾ ਗਿਆ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"ਇਹ ਫ਼ਾਈਲਾਂ ਕਿਸੇ ਹੋਰ ਫੌਰਮੈਟ ਵਿੱਚ ਤਬਦੀਲ ਕੀਤੀਆਂ ਗਈਆਂ ਸਨ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one">ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ <xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਦੀ ਪ੍ਰਤੀਲਿਪੀ ਬਣਾਈ ਗਈ।</item>
<item quantity="other">ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ <xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਦੀ ਪ੍ਰਤੀਲਿਪੀ ਬਣਾਈ ਗਈ।</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"ਇਸ ਸਥਾਨ ਵਿੱਚ ਚੁਣੀਆਂ ਗਈਆਂ ਫ਼ਾਈਲਾਂ ਨੂੰ ਪੇਸਟ ਨਹੀਂ ਕਰ ਸਕਦਾ ਹੈ।"</string>
<string name="menu_rename" msgid="7678802479104285353">"ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string>
<string name="rename_error" msgid="4203041674883412606">"ਦਸਤਾਵੇਜ਼ ਦਾ ਮੁੜ-ਨਾਮਕਰਨ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ਕੁਝ ਫ਼ਾਈਲਾਂ ਤਬਦੀਲ ਕੀਤੀਆਂ ਗਈਆਂ ਸਨ"</string>
+ <string name="allow" msgid="7225948811296386551">"ਆਗਿਆ ਦਿਓ"</string>
+ <string name="deny" msgid="2081879885755434506">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-pl/strings.xml b/packages/DocumentsUI/res/values-pl/strings.xml
index 3c86b7b..d30ed84 100644
--- a/packages/DocumentsUI/res/values-pl/strings.xml
+++ b/packages/DocumentsUI/res/values-pl/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Nowe okno"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiuj"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Wklej"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Pokaż pamięć wewnętrzną"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Pokaż kartę SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Ukryj pamięć wewnętrzną"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ukryj kartę SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Pokaż pamięć wewnętrzną"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Ukryj pamięć wewnętrzną"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Pokaż rozmiar pliku"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Ukryj rozmiar pliku"</string>
<string name="button_select" msgid="527196987259139214">"Wybierz"</string>
@@ -111,10 +109,10 @@
<item quantity="one">Nie udało się usunąć <xliff:g id="COUNT_0">%1$d</xliff:g> pliku</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Kliknij, by zobaczyć szczegóły"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Zamknij"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Te pliki nie zostały skopiowane: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Te pliki nie zostały przeniesione: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Te pliki zostały przekonwertowane na inny format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="few">Skopiowano <xliff:g id="COUNT_1">%1$d</xliff:g> pliki do schowka.</item>
<item quantity="many">Skopiowano <xliff:g id="COUNT_1">%1$d</xliff:g> plików do schowka.</item>
@@ -124,4 +122,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Nie można wkleić wybranych plików w tej lokalizacji."</string>
<string name="menu_rename" msgid="7678802479104285353">"Zmień nazwę"</string>
<string name="rename_error" msgid="4203041674883412606">"Nie udało się zmienić nazwy dokumentu"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Niektóre pliki zostały przekonwertowane"</string>
+ <string name="allow" msgid="7225948811296386551">"Zezwól"</string>
+ <string name="deny" msgid="2081879885755434506">"Odmów"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-pt-rBR/strings.xml b/packages/DocumentsUI/res/values-pt-rBR/strings.xml
index 186569c..068a4e6 100644
--- a/packages/DocumentsUI/res/values-pt-rBR/strings.xml
+++ b/packages/DocumentsUI/res/values-pt-rBR/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Nova janela"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copiar"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Colar"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Mostrar armaz. interno"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Mostrar cartão SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Ocultar armaz. interno"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ocultar cartão SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Mostrar armaz. interno"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Ocultar armaz. interno"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tam. do arquivo"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tam. do arquivo"</string>
<string name="button_select" msgid="527196987259139214">"Selecionar"</string>
@@ -99,10 +97,10 @@
<item quantity="other">Não foi possível excluir <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Tocar para ver detalhes"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Fechar"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Estes arquivos não foram copiados: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Estes arquivos não foram movidos: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Esses arquivos foram convertidos em outro formato: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> arquivos copiados para a área de transferência.</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> arquivos copiados para a área de transferência.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Não é possível colar os arquivos selecionados neste local."</string>
<string name="menu_rename" msgid="7678802479104285353">"Renomear"</string>
<string name="rename_error" msgid="4203041674883412606">"Falha ao renomear documento"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Alguns arquivos foram convertidos"</string>
+ <string name="allow" msgid="7225948811296386551">"Permitir"</string>
+ <string name="deny" msgid="2081879885755434506">"Negar"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-pt-rPT/strings.xml b/packages/DocumentsUI/res/values-pt-rPT/strings.xml
index 961330e..0897901 100644
--- a/packages/DocumentsUI/res/values-pt-rPT/strings.xml
+++ b/packages/DocumentsUI/res/values-pt-rPT/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Nova janela"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copiar"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Colar"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Mostrar mem. armaz. int."</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Mostrar cartão SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Ocultar mem. armaz. int."</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ocultar cartão SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Mostrar mem. armaz. int."</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Ocultar mem. armaz. int."</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tam. de fich."</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tam. de fich."</string>
<string name="button_select" msgid="527196987259139214">"Selecionar"</string>
@@ -99,10 +97,10 @@
<item quantity="one">Não foi possível eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Toque para ver detalhes"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Fechar"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Os seguintes ficheiros não foram copiados: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Os seguintes ficheiros não foram movidos: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Estes ficheiros foram convertidos para outro formato: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">Copiou <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros para a área de transferência.</item>
<item quantity="one">Copiou <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro para a área de transferência.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Não é possível colar os ficheiros selecionados nesta localização."</string>
<string name="menu_rename" msgid="7678802479104285353">"Mudar o nome"</string>
<string name="rename_error" msgid="4203041674883412606">"Falha ao mudar o nome do documento"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Alguns ficheiros foram convertidos"</string>
+ <string name="allow" msgid="7225948811296386551">"Permitir"</string>
+ <string name="deny" msgid="2081879885755434506">"Recusar"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-pt/strings.xml b/packages/DocumentsUI/res/values-pt/strings.xml
index 186569c..068a4e6 100644
--- a/packages/DocumentsUI/res/values-pt/strings.xml
+++ b/packages/DocumentsUI/res/values-pt/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Nova janela"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copiar"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Colar"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Mostrar armaz. interno"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Mostrar cartão SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Ocultar armaz. interno"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ocultar cartão SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Mostrar armaz. interno"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Ocultar armaz. interno"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tam. do arquivo"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tam. do arquivo"</string>
<string name="button_select" msgid="527196987259139214">"Selecionar"</string>
@@ -99,10 +97,10 @@
<item quantity="other">Não foi possível excluir <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Tocar para ver detalhes"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Fechar"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Estes arquivos não foram copiados: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Estes arquivos não foram movidos: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Esses arquivos foram convertidos em outro formato: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> arquivos copiados para a área de transferência.</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> arquivos copiados para a área de transferência.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Não é possível colar os arquivos selecionados neste local."</string>
<string name="menu_rename" msgid="7678802479104285353">"Renomear"</string>
<string name="rename_error" msgid="4203041674883412606">"Falha ao renomear documento"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Alguns arquivos foram convertidos"</string>
+ <string name="allow" msgid="7225948811296386551">"Permitir"</string>
+ <string name="deny" msgid="2081879885755434506">"Negar"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-ro/strings.xml b/packages/DocumentsUI/res/values-ro/strings.xml
index 4ba7618..c8c0c09 100644
--- a/packages/DocumentsUI/res/values-ro/strings.xml
+++ b/packages/DocumentsUI/res/values-ro/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Fereastră nouă"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copiați"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Inserați"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Afișați stocarea internă"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Afișați cardul SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Ascundeți stocarea internă"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ascundeți cardul SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Afișați stocarea internă"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Ascundeți stocarea internă"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Afișați mărime fișiere"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Ascundeți mărime fișiere"</string>
<string name="button_select" msgid="527196987259139214">"Selectați"</string>
@@ -105,10 +103,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fișier nu a fost șters</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Atingeți pentru a vedea detaliile"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Închideți"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Aceste fișiere nu au fost copiate: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Aceste fișiere nu au fost mutate: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Aceste fișiere au fost convertite în alt format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="few">Au fost copiate <xliff:g id="COUNT_1">%1$d</xliff:g> fișiere în clipboard.</item>
<item quantity="other">Au fost copiate <xliff:g id="COUNT_1">%1$d</xliff:g> de fișiere în clipboard.</item>
@@ -117,4 +115,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Fișierele selectate nu au putut fi inserate în această locație."</string>
<string name="menu_rename" msgid="7678802479104285353">"Redenumiți"</string>
<string name="rename_error" msgid="4203041674883412606">"Documentul nu a putut fi redenumit"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Unele fișiere au fost convertite"</string>
+ <string name="allow" msgid="7225948811296386551">"Permiteți"</string>
+ <string name="deny" msgid="2081879885755434506">"Refuzaţi"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-ru/strings.xml b/packages/DocumentsUI/res/values-ru/strings.xml
index 924473a..3f5e53c 100644
--- a/packages/DocumentsUI/res/values-ru/strings.xml
+++ b/packages/DocumentsUI/res/values-ru/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Новое окно"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Копировать"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Вставить"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Внутренняя память"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD-карта"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Скрыть внутреннюю память"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Скрыть SD-карту"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Внутренняя память"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Скрыть внутреннюю память"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Показать размер файлов"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Скрыть размер файлов"</string>
<string name="button_select" msgid="527196987259139214">"Выбрать"</string>
@@ -111,10 +109,10 @@
<item quantity="other">Не удалось удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Нажмите, чтобы узнать подробности."</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Закрыть"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Не удалось скопировать эти файлы: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Эти файлы не были перемещены: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Формат этих файлов изменен: <xliff:g id="LIST">%1$s</xliff:g>."</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one">Скопирован <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
<item quantity="few">Скопировано <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
@@ -124,4 +122,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Не удается вставить сюда выбранные файлы"</string>
<string name="menu_rename" msgid="7678802479104285353">"Переименовать"</string>
<string name="rename_error" msgid="4203041674883412606">"Не удалось переименовать документ"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Формат некоторых файлов изменен"</string>
+ <string name="allow" msgid="7225948811296386551">"Разрешить"</string>
+ <string name="deny" msgid="2081879885755434506">"Отклонить"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-si-rLK/strings.xml b/packages/DocumentsUI/res/values-si-rLK/strings.xml
index 382bed1..1237f14 100644
--- a/packages/DocumentsUI/res/values-si-rLK/strings.xml
+++ b/packages/DocumentsUI/res/values-si-rLK/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"නව කවුළුව"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"පිටපත් කරන්න"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"අලවන්න"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"අභ්යන්තර ආචයනය පෙන්වන්න"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD කාඩ් පත පෙන්වන්න"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"අභ්යන්තර ආචයනය සඟවන්න"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD කාඩ් පත සඟවන්න"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"අභ්යන්තර ආචයනය පෙන්වන්න"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"අභ්යන්තර ආචයනය සඟවන්න"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"ගොනු ප්රමණය පෙන්වන්න"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"ගොනු ප්රමණය සඟවන්න"</string>
<string name="button_select" msgid="527196987259139214">"තෝරන්න"</string>
@@ -99,10 +97,10 @@
<item quantity="other">ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g>ක් මැකීමට නොහැකි විය</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"විස්තර බැලීමට තට්ටු කරන්න"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"වසන්න"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"මෙම ගොනු පිටපත් නොකරන ලදී: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"මෙම ගොනු ගෙන නොයන ලදී: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"මෙම ගොනු වෙනත් ආකෘතියකට පරිවර්තනය කරන ලදී: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one">පසුරු පුවරුවට ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g> ක් පිටපත් කරන ලදි.</item>
<item quantity="other">පසුරු පුවරුවට ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g> ක් පිටපත් කරන ලදි.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"මෙම ස්ථානය තුළ තෝරාගත් ගොනු ඇලවිය නොහැක."</string>
<string name="menu_rename" msgid="7678802479104285353">"යළි නම් කරන්න"</string>
<string name="rename_error" msgid="4203041674883412606">"ලේඛනය යළි නම් කිරීම අසාර්ථක විය"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"සමහර ගොනු පරිවර්තනය කරන ලදී"</string>
+ <string name="allow" msgid="7225948811296386551">"අවසර දෙන්න"</string>
+ <string name="deny" msgid="2081879885755434506">"ප්රතික්ෂේප කරන්න"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-sk/strings.xml b/packages/DocumentsUI/res/values-sk/strings.xml
index 882f513..db2ec54 100644
--- a/packages/DocumentsUI/res/values-sk/strings.xml
+++ b/packages/DocumentsUI/res/values-sk/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Nové okno"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopírovať"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Prilepiť"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Zobraziť interné úložisko"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Zobraziť SD kartu"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Skryť interné úložisko"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Skryť SD kartu"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Zobraziť interné úložisko"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Skryť interné úložisko"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Zobraziť veľkosť súboru"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Skryť veľkosť súboru"</string>
<string name="button_select" msgid="527196987259139214">"Vybrať"</string>
@@ -111,10 +109,10 @@
<item quantity="one">Nepodarilo sa odstrániť <xliff:g id="COUNT_0">%1$d</xliff:g> súbor</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Klepnutím zobrazíte podrobnosti"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Zavrieť"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Tieto súbory neboli skopírované: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Tieto súbory neboli presunuté: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Tieto súbory boli konvertované do iného formátu: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="few">Do schránky boli skopírované <xliff:g id="COUNT_1">%1$d</xliff:g> súbory.</item>
<item quantity="many">Do schránky bolo skopírovaného <xliff:g id="COUNT_1">%1$d</xliff:g> súboru.</item>
@@ -124,4 +122,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Do tohto umiestnenia nie je možné prilepiť vybrané súbory"</string>
<string name="menu_rename" msgid="7678802479104285353">"Premenovať"</string>
<string name="rename_error" msgid="4203041674883412606">"Premenovanie dokumentu zlyhalo"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Niektoré súbory boli konvertované"</string>
+ <string name="allow" msgid="7225948811296386551">"Povoliť"</string>
+ <string name="deny" msgid="2081879885755434506">"Zamietnuť"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-sl/strings.xml b/packages/DocumentsUI/res/values-sl/strings.xml
index 154fdb2..f000f05 100644
--- a/packages/DocumentsUI/res/values-sl/strings.xml
+++ b/packages/DocumentsUI/res/values-sl/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Novo okno"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiraj"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Prilepi"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Pokaži notranjo shrambo"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Pokaži kartico SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Skrij notranjo shrambo"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Skrij kartico SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Pokaži notranjo shrambo"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Skrij notranjo shrambo"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Pokaži velikost datoteke"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Skrij velikost datoteke"</string>
<string name="button_select" msgid="527196987259139214">"Izberi"</string>
@@ -111,10 +109,10 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> datotek ni bilo mogoče izbrisati</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Dotaknite se za prikaz podrobnosti"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Zapri"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Te datoteke niso bile kopirane: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Te datoteke niso bile premaknjene: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Te datoteke so bile spremenjene v drugo obliko zapisa: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one">V odložišče je bila kopirana <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
<item quantity="two">V odložišče sta bili kopirani <xliff:g id="COUNT_1">%1$d</xliff:g> datoteki.</item>
@@ -124,4 +122,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Izbranih datotek ni mogoče prilepiti sem."</string>
<string name="menu_rename" msgid="7678802479104285353">"Preimenuj"</string>
<string name="rename_error" msgid="4203041674883412606">"Dokumenta ni bilo mogoče preimenovati"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Nekatere datoteke so bile pretvorjene"</string>
+ <string name="allow" msgid="7225948811296386551">"Dovoli"</string>
+ <string name="deny" msgid="2081879885755434506">"Zavrni"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-sq-rAL/strings.xml b/packages/DocumentsUI/res/values-sq-rAL/strings.xml
index bcb4ff0..fa53157 100644
--- a/packages/DocumentsUI/res/values-sq-rAL/strings.xml
+++ b/packages/DocumentsUI/res/values-sq-rAL/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Dritare e re"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopjo"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Ngjit"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Trego hapësirën e brendshme ruajtëse"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Shfaq kartën SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Fshih hapësirën ruajtëse të brendshme"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Fshih kartën SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Trego hapësirën e brendshme ruajtëse"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Fshih hapësirën ruajtëse të brendshme"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Shfaq madhësinë e skedarit"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Fshih madhësinë e skedarit"</string>
<string name="button_select" msgid="527196987259139214">"Zgjidh"</string>
@@ -99,10 +97,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> skedar nuk mund të fshihej</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Trokit për të parë detajet"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Mbyll"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Këta skedarë nuk u kopjuan: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Këta skedarë nuk u zhvendosën: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Këta skedarë janë konvertuar në format tjetër: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">U kopjuan <xliff:g id="COUNT_1">%1$d</xliff:g> skedarë në kujtesën e fragmenteve.</item>
<item quantity="one">U kopjua <xliff:g id="COUNT_0">%1$d</xliff:g> skedar në kujtesën e fragmenteve.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Skedarët e zgjedhur nuk mund të ngjiten në këtë vendndodhje."</string>
<string name="menu_rename" msgid="7678802479104285353">"Riemërto"</string>
<string name="rename_error" msgid="4203041674883412606">"Riemërtimi i dokumentit dështoi"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Disa skedarë u konvertuan"</string>
+ <string name="allow" msgid="7225948811296386551">"Lejo"</string>
+ <string name="deny" msgid="2081879885755434506">"Moho"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-sr/strings.xml b/packages/DocumentsUI/res/values-sr/strings.xml
index c0f8099..7b9f659 100644
--- a/packages/DocumentsUI/res/values-sr/strings.xml
+++ b/packages/DocumentsUI/res/values-sr/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Нови прозор"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Копирај"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Налепи"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Прикажи интерну меморију"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Прикажи SD картицу"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Сакриј интерну меморију"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Сакриј SD картицу"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Прикажи интерну меморију"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Сакриј интерну меморију"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Прикажи величину датотеке"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Сакриј величину датотеке"</string>
<string name="button_select" msgid="527196987259139214">"Изабери"</string>
@@ -105,10 +103,10 @@
<item quantity="other">Брисање <xliff:g id="COUNT_1">%1$d</xliff:g> датотека није успело</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Додирните да бисте приказали детаље"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Затвори"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Следеће датотеке нису копиране: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Ове датотеке нису премештене: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Ове датотеке су конвертоване у други формат: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one">Копирали сте <xliff:g id="COUNT_1">%1$d</xliff:g> датотеку у привремену меморију.</item>
<item quantity="few">Копирали сте <xliff:g id="COUNT_1">%1$d</xliff:g> датотеке у привремену меморију.</item>
@@ -117,4 +115,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Изабране датотеке не могу да се налепе на овој локацији."</string>
<string name="menu_rename" msgid="7678802479104285353">"Преименуј"</string>
<string name="rename_error" msgid="4203041674883412606">"Преименовање документа није успело"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Неке датотеке су конвертоване"</string>
+ <string name="allow" msgid="7225948811296386551">"Дозволи"</string>
+ <string name="deny" msgid="2081879885755434506">"Одбиј"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-sv/strings.xml b/packages/DocumentsUI/res/values-sv/strings.xml
index e9af1f9..3590fe7 100644
--- a/packages/DocumentsUI/res/values-sv/strings.xml
+++ b/packages/DocumentsUI/res/values-sv/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Nytt fönster"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiera"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Klistra in"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Visa internminne"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Visa SD-kort"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Dölj internminne"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Dölj SD-kort"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Visa internminne"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Dölj internminne"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Visa filstorlek"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Dölj filstorlek"</string>
<string name="button_select" msgid="527196987259139214">"Välj"</string>
@@ -99,10 +97,10 @@
<item quantity="one">Det gick inte att radera <xliff:g id="COUNT_0">%1$d</xliff:g> fil</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Tryck om du vill visa informationen"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Stäng"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Följande filer kopierades inte: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Följande filer har inte flyttats: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Filerna konverterades till ett annat format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> filer har kopierats till Urklipp.</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fil har kopierats till Urklipp.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Det går inte att klistra in den valda filen på den här platsen."</string>
<string name="menu_rename" msgid="7678802479104285353">"Byt namn"</string>
<string name="rename_error" msgid="4203041674883412606">"Det gick inte att byta namn på dokumentet"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Vissa filer konverterades"</string>
+ <string name="allow" msgid="7225948811296386551">"Tillåt"</string>
+ <string name="deny" msgid="2081879885755434506">"Neka"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-sw/strings.xml b/packages/DocumentsUI/res/values-sw/strings.xml
index 188f5b5..f15db63 100644
--- a/packages/DocumentsUI/res/values-sw/strings.xml
+++ b/packages/DocumentsUI/res/values-sw/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Dirisha jipya"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Nakili"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Bandika"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Onyesha hifadhi ya ndani"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Onyesha kadi ya SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Ficha hifadhi ya ndani"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ficha kadi ya SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Onyesha hifadhi ya ndani"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Ficha hifadhi ya ndani"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Onyesha ukubwa wa faili"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Ficha ukubwa wa faili"</string>
<string name="button_select" msgid="527196987259139214">"Teua"</string>
@@ -99,10 +97,10 @@
<item quantity="one">Haikuweza kufuta faili <xliff:g id="COUNT_0">%1$d</xliff:g></item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Gonga ili uangalie maelezo"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Funga"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Faili hizi hazikunakiliwa: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Faili hizi hazikuhamishwa: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Faili hizi zimebadilishwa muundo. <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">Alinakili faili <xliff:g id="COUNT_1">%1$d</xliff:g> kwenye ubao wa kunakili.</item>
<item quantity="one">Alinakili faili <xliff:g id="COUNT_0">%1$d</xliff:g> kwenye ubao wa kunakili.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Haiwezi kubandika faili zilizochaguliwa katika eneo hili."</string>
<string name="menu_rename" msgid="7678802479104285353">"Badilisha jina"</string>
<string name="rename_error" msgid="4203041674883412606">"Imeshindwa kubadilisha jina la hati"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Baadhi ya faili zimebadilishwa muundo"</string>
+ <string name="allow" msgid="7225948811296386551">"Ruhusu"</string>
+ <string name="deny" msgid="2081879885755434506">"Kataza"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-ta-rIN/strings.xml b/packages/DocumentsUI/res/values-ta-rIN/strings.xml
index a6d52c4..3b71514 100644
--- a/packages/DocumentsUI/res/values-ta-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-ta-rIN/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"புதிய சாளரம்"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"நகலெடு"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"ஒட்டு"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"அகச் சேமிப்பகத்தைக் காட்டு"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD கார்டைக் காட்டு"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"அகச் சேமிப்பகத்தை மறை"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD கார்டை மறை"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"அகச் சேமிப்பகத்தைக் காட்டு"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"அகச் சேமிப்பகத்தை மறை"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"கோப்பு அளவைக் காட்டு"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"கோப்பு அளவை மறை"</string>
<string name="button_select" msgid="527196987259139214">"தேர்ந்தெடு"</string>
@@ -99,10 +97,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> கோப்பை நீக்க முடியவில்லை</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"விவரங்களைப் பார்க்க, தட்டவும்"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"மூடு"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"நகலெடுக்கப்படாத கோப்புகள்: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"இந்தக் கோப்புகள் நகர்த்தப்படவில்லை: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"இந்தக் கோப்புகள் வேறொரு வடிவத்திற்கு மாற்றப்பட்டன: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">கிளிப்போர்டிற்கு <xliff:g id="COUNT_1">%1$d</xliff:g> கோப்புகள் நகலெடுக்கப்பட்டன.</item>
<item quantity="one">கிளிப்போர்டிற்கு <xliff:g id="COUNT_0">%1$d</xliff:g> கோப்பு நகலெடுக்கப்பட்டது.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"தேர்ந்தெடுத்த கோப்புகளை இங்கு ஒட்ட முடியாது."</string>
<string name="menu_rename" msgid="7678802479104285353">"மறுபெயரிடு"</string>
<string name="rename_error" msgid="4203041674883412606">"ஆவணத்திற்கு மறுபெயரிடுவதில் தோல்வி"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"சில கோப்புகள் மாற்றப்பட்டன"</string>
+ <string name="allow" msgid="7225948811296386551">"அனுமதி"</string>
+ <string name="deny" msgid="2081879885755434506">"நிராகரி"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-te-rIN/strings.xml b/packages/DocumentsUI/res/values-te-rIN/strings.xml
index b2ac712..900fe41 100644
--- a/packages/DocumentsUI/res/values-te-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-te-rIN/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"కొత్త విండో"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"కాపీ చేయి"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"అతికించు"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"అంతర్గత నిల్వను చూపు"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD కార్డ్ను చూపు"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"అంతర్గత నిల్వను దాచు"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD కార్డ్ను దాచు"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"అంతర్గత నిల్వను చూపు"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"అంతర్గత నిల్వను దాచు"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"ఫైల్ పరిమాణాన్ని చూపు"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"ఫైల్ పరిమాణాన్ని దాచు"</string>
<string name="button_select" msgid="527196987259139214">"ఎంచుకోండి"</string>
@@ -99,10 +97,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ఫైల్ను తొలగించడం సాధ్యపడలేదు</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"వివరాలను వీక్షించడానికి నొక్కండి"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"మూసివేయి"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"ఈ ఫైల్లు కాపీ చేయబడలేదు: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"ఈ ఫైల్లు తరలించబడలేదు: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"ఈ ఫైల్లు మరొక ఆకృతికి మార్చబడ్డాయి: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">క్లిప్బోర్డ్కి <xliff:g id="COUNT_1">%1$d</xliff:g> ఫైల్లను కాపీ చేసారు.</item>
<item quantity="one">క్లిప్బోర్డ్కి <xliff:g id="COUNT_0">%1$d</xliff:g> ఫైల్ను కాపీ చేసారు.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"ఎంచుకున్న ఫైల్లను ఈ స్థానంలోకి తీసుకురావడం సాధ్యపడదు."</string>
<string name="menu_rename" msgid="7678802479104285353">"పేరు మార్చు"</string>
<string name="rename_error" msgid="4203041674883412606">"పత్రం పేరు మార్చడంలో విఫలమైంది"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"కొన్ని పైల్లు మార్చబడ్డాయి"</string>
+ <string name="allow" msgid="7225948811296386551">"అనుమతించండి"</string>
+ <string name="deny" msgid="2081879885755434506">"తిరస్కరించండి"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-th/strings.xml b/packages/DocumentsUI/res/values-th/strings.xml
index 3261019..4d93f43 100644
--- a/packages/DocumentsUI/res/values-th/strings.xml
+++ b/packages/DocumentsUI/res/values-th/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"หน้าต่างใหม่"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"คัดลอก"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"วาง"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"แสดงที่จัดเก็บภายใน"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"แสดงการ์ด SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"ซ่อนที่จัดเก็บภายใน"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"ซ่อนการ์ด SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"แสดงที่จัดเก็บภายใน"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"ซ่อนที่จัดเก็บภายใน"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"แสดงขนาดไฟล์"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"ซ่อนขนาดไฟล์"</string>
<string name="button_select" msgid="527196987259139214">"เลือก"</string>
@@ -99,10 +97,10 @@
<item quantity="one">ไม่สามารถลบ <xliff:g id="COUNT_0">%1$d</xliff:g> ไฟล์</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"แตะเพื่อดูรายละเอียด"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"ปิด"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"ไม่มีการคัดลอกไฟล์เหล่านี้: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"ไม่มีการย้ายไฟล์เหล่านี้: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"ไฟล์ต่อไปนี้แปลงเป็นอีกรูปแบบหนึ่งแล้ว: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">คัดลอก <xliff:g id="COUNT_1">%1$d</xliff:g> ไฟล์ไปยังคลิปบอร์ดแล้ว</item>
<item quantity="one">คัดลอก <xliff:g id="COUNT_0">%1$d</xliff:g> ไฟล์ไปยังคลิปบอร์ดแล้ว</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"ไม่สามารถวางไฟล์ที่เลือกในตำแหน่งนี้"</string>
<string name="menu_rename" msgid="7678802479104285353">"เปลี่ยนชื่อ"</string>
<string name="rename_error" msgid="4203041674883412606">"ไม่สามารถเปลี่ยนชื่อเอกสาร"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"แปลงบางไฟล์แล้ว"</string>
+ <string name="allow" msgid="7225948811296386551">"อนุญาต"</string>
+ <string name="deny" msgid="2081879885755434506">"ปฏิเสธ"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-tl/strings.xml b/packages/DocumentsUI/res/values-tl/strings.xml
index 6548908..d28eb69 100644
--- a/packages/DocumentsUI/res/values-tl/strings.xml
+++ b/packages/DocumentsUI/res/values-tl/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Bagong window"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopyahin"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"I-paste"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Ipakita internal storage"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Ipakita ang SD card"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Itago internal storage"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Itago ang SD card"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Ipakita internal storage"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Itago internal storage"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Ipakita ang laki ng file"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Itago ang laki ng file"</string>
<string name="button_select" msgid="527196987259139214">"Pumili"</string>
@@ -99,10 +97,10 @@
<item quantity="other">Hindi ma-delete ang <xliff:g id="COUNT_1">%1$d</xliff:g> na file</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"I-tap upang tingnan ang mga detalye"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Isara"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Hindi nakopya ang mga file na ito: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Hindi nailipat ang mga file na ito: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Na-convert ang mga file na ito sa ibang format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one">Nakopya ang <xliff:g id="COUNT_1">%1$d</xliff:g> file sa clipboard.</item>
<item quantity="other">Nakopya ang <xliff:g id="COUNT_1">%1$d</xliff:g> na file sa clipboard.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Hindi mai-paste sa lokasyong ito ang mga piniling file."</string>
<string name="menu_rename" msgid="7678802479104285353">"Palitan ang pangalan"</string>
<string name="rename_error" msgid="4203041674883412606">"Hindi napalitan ang pangalan ng dokumento"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Na-convert ang ilang file"</string>
+ <string name="allow" msgid="7225948811296386551">"Payagan"</string>
+ <string name="deny" msgid="2081879885755434506">"Tanggihan"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-tr/strings.xml b/packages/DocumentsUI/res/values-tr/strings.xml
index 2db4a1b..5223919 100644
--- a/packages/DocumentsUI/res/values-tr/strings.xml
+++ b/packages/DocumentsUI/res/values-tr/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Yeni pencere"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopyala"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Yapıştır"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Dahili depolamayı göster"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD kartı göster"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Dahili depolamayı gizle"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD kartı gizle"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Dahili depolamayı göster"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Dahili depolamayı gizle"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Dosya boyutunu göster"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Dosya boyutunu gizle"</string>
<string name="button_select" msgid="527196987259139214">"Seç"</string>
@@ -99,10 +97,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dosya silinemedi</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Ayrıntıları görmek için hafifçe dokunun"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Kapat"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Şu dosyalar kopyalanmadı: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Şu dosyalar taşınmadı: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Bu dosyalar başka bir biçime dönüştürüldü: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dosya panoya kopyalandı.</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dosya panoya kopyalandı.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Seçili dosyalar bu konuma yapıştırılamıyor."</string>
<string name="menu_rename" msgid="7678802479104285353">"Yeniden Adlandır"</string>
<string name="rename_error" msgid="4203041674883412606">"Dokümanın adı değiştirilemedi"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Bazı dosyalar dönüştürüldü"</string>
+ <string name="allow" msgid="7225948811296386551">"İzin Ver"</string>
+ <string name="deny" msgid="2081879885755434506">"Reddet"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-uk/strings.xml b/packages/DocumentsUI/res/values-uk/strings.xml
index 8624aec..1987ee2 100644
--- a/packages/DocumentsUI/res/values-uk/strings.xml
+++ b/packages/DocumentsUI/res/values-uk/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Нове вікно"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Копіювати"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Вставити"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Показати внутр. пам’ять"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Показати карту SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Сховати внутр. пам’ять"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Сховати карту SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Показати внутр. пам’ять"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Сховати внутр. пам’ять"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Показати розмір файлу"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Сховати розмір файлу"</string>
<string name="button_select" msgid="527196987259139214">"Вибрати"</string>
@@ -111,10 +109,10 @@
<item quantity="other">Не вдалося видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файлу</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Торкніться, щоб переглянути деталі"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Закрити"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Ці файли не скопійовано: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Не переміщено ці файли: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Ці файли конвертовано в інший формат: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one">У буфер обміну скопійовано <xliff:g id="COUNT_1">%1$d</xliff:g> файл.</item>
<item quantity="few">У буфер обміну скопійовано <xliff:g id="COUNT_1">%1$d</xliff:g> файли.</item>
@@ -124,4 +122,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Не вдається вставити вибрані файли в цю папку."</string>
<string name="menu_rename" msgid="7678802479104285353">"Перейменувати"</string>
<string name="rename_error" msgid="4203041674883412606">"Не вдалося перейменувати документ"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Деякі файли конвертовано"</string>
+ <string name="allow" msgid="7225948811296386551">"Дозвол."</string>
+ <string name="deny" msgid="2081879885755434506">"Забор."</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-ur-rPK/strings.xml b/packages/DocumentsUI/res/values-ur-rPK/strings.xml
index 6ddad5f..3871496 100644
--- a/packages/DocumentsUI/res/values-ur-rPK/strings.xml
+++ b/packages/DocumentsUI/res/values-ur-rPK/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"نئی ونڈو"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"کاپی کریں"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"پیسٹ کریں"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"داخلی اسٹوریج دکھائیں"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD کارڈ دکھائیں"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"داخلی اسٹوریج چھپائیں"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD کارڈ چھپائیں"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"داخلی اسٹوریج دکھائیں"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"داخلی اسٹوریج چھپائیں"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"فائل سائز دکھائیں"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"فائل سائز چھپائیں"</string>
<string name="button_select" msgid="527196987259139214">"منتخب کریں"</string>
@@ -99,10 +97,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> فائل حذف نہیں ہو سکی</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"تفصیلات دیکھنے کیلئے تھپتھپائیں"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"بند کریں"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"یہ فائلز کاپی نہیں کی گئیں: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"یہ فائلیں منتقل نہیں ہوئیں: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"ان فائلوں کو ایک دوسرے فارمیٹ میں تبدیل کیا گیا تھا: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فائلز کلپ بورڈ پر کاپی کی گئیں۔</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> فائل کلپ بورڈ پر کاپی کی گئی۔</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"منتخب کردہ فائلز کو اس مقام پر پیسٹ نہیں کیا جا سکتا۔"</string>
<string name="menu_rename" msgid="7678802479104285353">"نام تبدیل کریں"</string>
<string name="rename_error" msgid="4203041674883412606">"دستاویز کا نام تبدیل کرنے میں ناکام"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"کچھ فائلوں کو تبدیل کیا گیا تھا"</string>
+ <string name="allow" msgid="7225948811296386551">"اجازت دیں"</string>
+ <string name="deny" msgid="2081879885755434506">"مسترد کریں"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-uz-rUZ/strings.xml b/packages/DocumentsUI/res/values-uz-rUZ/strings.xml
index 78e48c6..a915afd 100644
--- a/packages/DocumentsUI/res/values-uz-rUZ/strings.xml
+++ b/packages/DocumentsUI/res/values-uz-rUZ/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Yangi oyna"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Nusxalash"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Joylash"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Ichki xotirani ko‘rsatish"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD kartani ko‘rsatish"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Ichki xotirani berkitish"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD kartani berkitish"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Ichki xotirani ko‘rsatish"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Ichki xotirani berkitish"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Fayl hajmini ko‘rsatish"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Fayl hajmini berkitish"</string>
<string name="button_select" msgid="527196987259139214">"Tanlash"</string>
@@ -99,10 +97,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta faylni o‘chirib bo‘lmadi</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Batafsil ma’lumot olish uchun bosing"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Yopish"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Ushbu fayllardan nusxa olinmadi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Ushbu fayllar ko‘chirib o‘tkazilmadi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Ushbu fayllar boshqa formatga o‘girildi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta fayldan vaqtinchalik xotiraga nusxa olindi.</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta fayldan vaqtinchalik xotiraga nusxa olindi.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Tanlangan fayllarni bu yerga joylab bo‘lmadi."</string>
<string name="menu_rename" msgid="7678802479104285353">"Qayta nomlash"</string>
<string name="rename_error" msgid="4203041674883412606">"Hujjatni qayta nomlab bo‘lmadi"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Bir nechta fayllar o‘girildi"</string>
+ <string name="allow" msgid="7225948811296386551">"Ruxsat berish"</string>
+ <string name="deny" msgid="2081879885755434506">"Rad qilish"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-vi/strings.xml b/packages/DocumentsUI/res/values-vi/strings.xml
index 3f44f62..536c7a5 100644
--- a/packages/DocumentsUI/res/values-vi/strings.xml
+++ b/packages/DocumentsUI/res/values-vi/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Cửa sổ mới"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Sao chép"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Dán"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Hiển thị bộ nhớ trong"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Hiển thị thẻ SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Ẩn bộ nhớ trong"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ẩn thẻ SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Hiển thị bộ nhớ trong"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Ẩn bộ nhớ trong"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Hiển thị kích thước tệp"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Ẩn kích thước tệp"</string>
<string name="button_select" msgid="527196987259139214">"Chọn"</string>
@@ -99,10 +97,10 @@
<item quantity="one">Không thể xóa <xliff:g id="COUNT_0">%1$d</xliff:g> tệp</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Nhấn để xem chi tiết"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Đóng"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Những tệp này chưa được sao chép: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Những tệp này chưa được di chuyển: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Các tệp này đã được chuyển đổi sang định dạng khác: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">Đã sao chép <xliff:g id="COUNT_1">%1$d</xliff:g> tệp vào khay nhớ tạm.</item>
<item quantity="one">Đã sao chép <xliff:g id="COUNT_0">%1$d</xliff:g> tệp vào khay nhớ tạm.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Không thể dán các tệp đã chọn vào vị trí này."</string>
<string name="menu_rename" msgid="7678802479104285353">"Đổi tên"</string>
<string name="rename_error" msgid="4203041674883412606">"Không đổi được tên tài liệu"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Đã chuyển đổi một số tệp"</string>
+ <string name="allow" msgid="7225948811296386551">"Cho phép"</string>
+ <string name="deny" msgid="2081879885755434506">"Từ chối"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-zh-rCN/strings.xml b/packages/DocumentsUI/res/values-zh-rCN/strings.xml
index c8b4a82..df2cf04 100644
--- a/packages/DocumentsUI/res/values-zh-rCN/strings.xml
+++ b/packages/DocumentsUI/res/values-zh-rCN/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"新建窗口"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"复制"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"粘贴"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"显示内部存储设备"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"显示SD卡"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"隐藏内部存储设备"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"隐藏SD卡"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"显示内部存储设备"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"隐藏内部存储设备"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"显示文件大小"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"隐藏文件大小"</string>
<string name="button_select" msgid="527196987259139214">"选择"</string>
@@ -99,10 +97,11 @@
<item quantity="one">无法删除 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"点按即可查看详情"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"关闭"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"以下文件无法复制：<xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"以下文件无法移动：<xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <!-- no translation found for copy_converted_warning_content (5753861488218674361) -->
+ <skip />
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">已将 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件复制到剪贴板。</item>
<item quantity="one">已将 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件复制到剪贴板。</item>
@@ -110,4 +109,8 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"无法将所选文件粘贴到此位置。"</string>
<string name="menu_rename" msgid="7678802479104285353">"重命名"</string>
<string name="rename_error" msgid="4203041674883412606">"无法重命名文档"</string>
+ <!-- no translation found for notification_copy_files_converted_title (3153573223054275181) -->
+ <skip />
+ <string name="allow" msgid="7225948811296386551">"允许"</string>
+ <string name="deny" msgid="2081879885755434506">"拒绝"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-zh-rHK/strings.xml b/packages/DocumentsUI/res/values-zh-rHK/strings.xml
index 46c1be3..fa66c7f 100644
--- a/packages/DocumentsUI/res/values-zh-rHK/strings.xml
+++ b/packages/DocumentsUI/res/values-zh-rHK/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"新視窗"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"複製"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"貼上"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"顯示內部儲存空間"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"顯示 SD 卡"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"隱藏內部儲存空間"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"隱藏 SD 卡"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"顯示內部儲存空間"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"隱藏內部儲存空間"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"顯示檔案大小"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"隱藏檔案大小"</string>
<string name="button_select" msgid="527196987259139214">"選取"</string>
@@ -99,10 +97,10 @@
<item quantity="one">無法刪除 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"輕按即可查看詳細資訊"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"關閉"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"以下檔案未能複製：<xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"這些檔案並未移動：<xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"這些檔案已轉換成其他格式：<xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">已複製 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案到剪貼簿。</item>
<item quantity="one">已複製 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案到剪貼簿。</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"無法在此位置貼上選取檔案。"</string>
<string name="menu_rename" msgid="7678802479104285353">"重新命名"</string>
<string name="rename_error" msgid="4203041674883412606">"無法重新命名文件"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"部分檔案已轉換成其他格式"</string>
+ <string name="allow" msgid="7225948811296386551">"允許"</string>
+ <string name="deny" msgid="2081879885755434506">"拒絕"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-zh-rTW/strings.xml b/packages/DocumentsUI/res/values-zh-rTW/strings.xml
index 1502176..0288bd3 100644
--- a/packages/DocumentsUI/res/values-zh-rTW/strings.xml
+++ b/packages/DocumentsUI/res/values-zh-rTW/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"新視窗"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"複製"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"貼上"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"顯示內部儲存空間"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"顯示 SD 卡"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"隱藏內部儲存空間"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"隱藏 SD 卡"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"顯示內部儲存空間"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"隱藏內部儲存空間"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"顯示檔案大小"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"隱藏檔案大小"</string>
<string name="button_select" msgid="527196987259139214">"選取"</string>
@@ -99,10 +97,10 @@
<item quantity="one">無法刪除 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案</item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"輕按即可查看詳細資訊"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"關閉"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"未複製這些檔案：<xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"未移動以下檔案：<xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"下列檔案已轉換成其他格式：<xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">已將 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案複製到剪貼簿。</item>
<item quantity="one">已將 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案複製到剪貼簿。</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"無法將所選檔案貼到這個位置。"</string>
<string name="menu_rename" msgid="7678802479104285353">"重新命名"</string>
<string name="rename_error" msgid="4203041674883412606">"無法重新命名文件"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"部分檔案已轉換成其他格式"</string>
+ <string name="allow" msgid="7225948811296386551">"允許"</string>
+ <string name="deny" msgid="2081879885755434506">"拒絕"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-zu/strings.xml b/packages/DocumentsUI/res/values-zu/strings.xml
index 44f82cf..9bff355 100644
--- a/packages/DocumentsUI/res/values-zu/strings.xml
+++ b/packages/DocumentsUI/res/values-zu/strings.xml
@@ -37,10 +37,8 @@
<string name="menu_new_window" msgid="1226032889278727538">"Iwindi elisha"</string>
<string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopisha"</string>
<string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Namathisela"</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Bonisa isitoreji sangaphakathi"</string>
- <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Bonisa ikhadi le-SD"</string>
- <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Fihla isitoreji sangaphakathi"</string>
- <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Fihla ikhadi le-SD"</string>
+ <string name="menu_advanced_show" msgid="4693652895715631401">"Bonisa isitoreji sangaphakathi"</string>
+ <string name="menu_advanced_hide" msgid="4218809952721972589">"Fihla isitoreji sangaphakathi"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"Bonisa usayizi wefayela"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"Fihla usayizi wefayela"</string>
<string name="button_select" msgid="527196987259139214">"Khetha"</string>
@@ -99,10 +97,10 @@
<item quantity="other">Ayikwazanga ukususa amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g></item>
</plurals>
<string name="notification_touch_for_details" msgid="6268189413228855582">"Thepha ukuze ubuke imininingwane"</string>
- <!-- no translation found for close (3043722427445528732) -->
- <skip />
+ <string name="close" msgid="3043722427445528732">"Vala"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"Lawa mafayela awazange akopishwe: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"Lawa mafayela awazange ahanjiswe: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"Lawo mafayela aguqulelwe kwenye ifomethi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="one">Kukopishwe amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g> kubhodi lokunamathisela.</item>
<item quantity="other">Kukopishwe amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g> kubhodi lokunamathisela.</item>
@@ -110,4 +108,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Ayikwazi ukunamathisela amafayela akhethiwe kule ndawo."</string>
<string name="menu_rename" msgid="7678802479104285353">"Qamba kabusha"</string>
<string name="rename_error" msgid="4203041674883412606">"Yehlulekile ukuqamba kabusha idokhumenti"</string>
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Amanye amafayela aguqulelwe"</string>
+ <string name="allow" msgid="7225948811296386551">"Vumela"</string>
+ <string name="deny" msgid="2081879885755434506">"Yala"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values/config.xml b/packages/DocumentsUI/res/values/config.xml
index ff28e15..e8d8c8e 100644
--- a/packages/DocumentsUI/res/values/config.xml
+++ b/packages/DocumentsUI/res/values/config.xml
@@ -18,7 +18,6 @@
<!-- Allow Advanced Devices default value to be customised -->
<bool name="config_defaultAdvancedDevices">false</bool>
- <bool name="productivity_device">true</bool>
<!-- Intentionally unset. Vendors should set this in an overlay. -->
<string name="trusted_quick_viewer_package"></string>
</resources>
diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
index 5ffc435..1474aa6 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
@@ -104,7 +104,6 @@
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
- mProductivityDevice = getResources().getBoolean(R.bool.productivity_device);
mState = (icicle != null)
? icicle.<State>getParcelable(EXTRA_STATE)
: buildState();
@@ -152,6 +151,7 @@
final MenuItem advanced = menu.findItem(R.id.menu_advanced);
final MenuItem fileSize = menu.findItem(R.id.menu_file_size);
final MenuItem settings = menu.findItem(R.id.menu_settings);
+ final MenuItem search = menu.findItem(R.id.menu_search);
// I'm thinkin' this isn't necesary here. If it is...'cuz of a bug....
// then uncomment the linke and let's get a proper bug reference here.
@@ -168,6 +168,7 @@
fileSize.setVisible(!mState.forceSize);
advanced.setVisible(!mState.forceAdvanced);
settings.setVisible((root.flags & Root.FLAG_HAS_SETTINGS) != 0);
+ search.setVisible(canSearchRoot());
advanced.setTitle(LocalPreferences.getDisplayAdvancedDevices(this)
? R.string.menu_advanced_hide : R.string.menu_advanced_show);
@@ -385,6 +386,11 @@
return authorities;
}
+ boolean canSearchRoot() {
+ final RootInfo root = getCurrentRoot();
+ return (root.flags & Root.FLAG_SUPPORTS_SEARCH) != 0;
+ }
+
final String getCallingPackageMaybeExtra() {
String callingPackage = getCallingPackage();
// System apps can set the calling package name using an extra.
@@ -492,6 +498,10 @@
return;
}
+ if (DirectoryFragment.get(getFragmentManager()).onBackPressed()) {
+ return;
+ }
+
if (!mState.hasLocationChanged()) {
super.onBackPressed();
return;
diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
index 393fdcd..b490c00 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
@@ -16,12 +16,11 @@
package com.android.documentsui;
+import static com.android.documentsui.OperationDialogFragment.DIALOG_TYPE_UNKNOWN;
import static com.android.documentsui.Shared.DEBUG;
import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_NONE;
import static com.android.internal.util.Preconditions.checkArgument;
import static com.android.internal.util.Preconditions.checkState;
-import static com.android.documentsui.OperationDialogFragment.DialogType;
-import static com.android.documentsui.OperationDialogFragment.DIALOG_TYPE_UNKNOWN;
import android.app.Activity;
import android.app.FragmentManager;
@@ -45,6 +44,7 @@
import android.widget.Spinner;
import android.widget.Toolbar;
+import com.android.documentsui.OperationDialogFragment.DialogType;
import com.android.documentsui.RecentsProvider.ResumeColumns;
import com.android.documentsui.dirlist.DirectoryFragment;
import com.android.documentsui.model.DocumentInfo;
@@ -256,9 +256,6 @@
pasteFromCb.setEnabled(mClipper.hasItemsToPaste());
- newWindow.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
- newWindow.setVisible(mProductivityDevice);
-
Menus.disableHiddenItems(menu, pasteFromCb);
return true;
}
@@ -287,6 +284,14 @@
Metrics.logMultiWindow(this);
Intent intent = LauncherActivity.createLaunchIntent(this);
intent.putExtra(Shared.EXTRA_STACK, (Parcelable) mState.stack);
+
+ // With new multi-window mode we have to pick how we are launched.
+ // By default we'd be launched in-place above the existing app.
+ // By setting launch-to-side ActivityManager will open us to side.
+ if (inMultiWindow()) {
+ intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
+ }
+
startActivity(intent);
}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/LauncherActivity.java b/packages/DocumentsUI/src/com/android/documentsui/LauncherActivity.java
index b3d0cf3..7930c28 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/LauncherActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/LauncherActivity.java
@@ -74,6 +74,9 @@
private void startTask() {
Intent intent = createLaunchIntent(this);
+
+ // Forward any flags from the original intent.
+ intent.setFlags(getIntent().getFlags());
if (DEBUG) Log.d(TAG, "Starting new task > " + intent.getData());
startActivity(intent);
}
@@ -84,7 +87,7 @@
startActivity(intent);
}
- static Intent createLaunchIntent(Context context) {
+ static final Intent createLaunchIntent(Context context) {
Intent intent = new Intent(context, FilesActivity.class);
intent.setData(buildLaunchUri());
return intent;
diff --git a/packages/DocumentsUI/src/com/android/documentsui/Metrics.java b/packages/DocumentsUI/src/com/android/documentsui/Metrics.java
index eb90b75..bae334b 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/Metrics.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/Metrics.java
@@ -17,7 +17,10 @@
package com.android.documentsui;
import static com.android.documentsui.Shared.DEBUG;
+import static com.android.internal.util.Preconditions.checkArgument;
+import android.annotation.IntDef;
+import android.annotation.Nullable;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ResolveInfo;
@@ -25,9 +28,16 @@
import android.provider.DocumentsContract;
import android.util.Log;
+import com.android.documentsui.model.DocumentInfo;
import com.android.documentsui.model.RootInfo;
+import com.android.documentsui.services.FileOperationService;
+import com.android.documentsui.services.FileOperationService.OpType;
import com.android.internal.logging.MetricsLogger;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.List;
+
/** @hide */
public final class Metrics {
private static final String TAG = "Metrics";
@@ -37,6 +47,7 @@
private static final String AUTHORITY_MEDIA = "com.android.providers.media.documents";
private static final String AUTHORITY_STORAGE = "com.android.externalstorage.documents";
private static final String AUTHORITY_DOWNLOADS = "com.android.providers.downloads.documents";
+ private static final String AUTHORITY_MTP = "com.android.mtp.documents";
// These strings have to be whitelisted in tron. Do not change them.
private static final String COUNT_LAUNCH_ACTION = "docsui_launch_action";
@@ -47,11 +58,16 @@
private static final String COUNT_BROWSE_ROOT = "docsui_browse_root";
private static final String COUNT_MANAGE_ROOT = "docsui_manage_root";
private static final String COUNT_MULTI_WINDOW = "docsui_multi_window";
+ private static final String COUNT_FILEOP_SYSTEM = "docsui_fileop_system";
+ private static final String COUNT_FILEOP_EXTERNAL = "docsui_fileop_external";
+ private static final String COUNT_FILEOP_CANCELED = "docsui_fileop_canceled";
// Indices for bucketing roots in the roots histogram. "Other" is the catch-all index for any
// root that is not explicitly recognized by the Metrics code (see {@link
// #getSanitizedRootIndex}). Apps are also bucketed in this histogram using negative indices
// (see below).
+ // Do not change or rearrange these values, that will break historical data. Only add to the end
+ // of the list.
private static final int ROOT_NONE = 0;
private static final int ROOT_OTHER = 1;
private static final int ROOT_AUDIO = 2;
@@ -61,10 +77,27 @@
private static final int ROOT_IMAGES = 6;
private static final int ROOT_RECENTS = 7;
private static final int ROOT_VIDEOS = 8;
+ private static final int ROOT_MTP = 9;
// Apps aren't really "roots", but they are treated as such in the roots fragment UI and so they
// are logged analogously to roots. Use negative numbers to identify apps.
private static final int ROOT_THIRD_PARTY_APP = -1;
+ @IntDef(flag = true, value = {
+ ROOT_NONE,
+ ROOT_OTHER,
+ ROOT_AUDIO,
+ ROOT_DEVICE_STORAGE,
+ ROOT_DOWNLOADS,
+ ROOT_HOME,
+ ROOT_IMAGES,
+ ROOT_RECENTS,
+ ROOT_VIDEOS,
+ ROOT_MTP,
+ ROOT_THIRD_PARTY_APP
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface Root {}
+
// Indices for bucketing mime types.
private static final int MIME_OTHER = -2; // anything not enumerated below
private static final int MIME_NONE = -1; // null mime
@@ -77,6 +110,66 @@
private static final int MIME_TEXT = 6; // text/*
private static final int MIME_VIDEO = 7; // video/*
+ @IntDef(flag = true, value = {
+ MIME_OTHER,
+ MIME_NONE,
+ MIME_ANY,
+ MIME_APPLICATION,
+ MIME_AUDIO,
+ MIME_IMAGE,
+ MIME_MESSAGE,
+ MIME_MULTIPART,
+ MIME_TEXT,
+ MIME_VIDEO
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface Mime {}
+
+ // Codes representing different kinds of file operations. These are used for bucketing
+ // operations in the COUNT_FILEOP_{SYSTEM|EXTERNAL} histograms.
+ private static final int FILEOP_OTHER = 0; // any file operation not listed below
+ private static final int FILEOP_COPY_INTRA_PROVIDER = 1; // Copy within a provider
+ private static final int FILEOP_COPY_SYSTEM_PROVIDER = 2; // Copy to a system provider.
+ private static final int FILEOP_COPY_EXTERNAL_PROVIDER = 3; // Copy to a 3rd-party provider.
+ private static final int FILEOP_MOVE_INTRA_PROVIDER = 4; // Move within a provider.
+ private static final int FILEOP_MOVE_SYSTEM_PROVIDER = 5; // Move to a system provider.
+ private static final int FILEOP_MOVE_EXTERNAL_PROVIDER = 6; // Move to a 3rd-party provider.
+ private static final int FILEOP_DELETE = 7;
+ private static final int FILEOP_OTHER_ERROR = -1;
+ private static final int FILEOP_COPY_ERROR = -2;
+ private static final int FILEOP_MOVE_ERROR = -3;
+ private static final int FILEOP_DELETE_ERROR = -4;
+
+ @IntDef(flag = true, value = {
+ FILEOP_OTHER,
+ FILEOP_COPY_INTRA_PROVIDER,
+ FILEOP_COPY_SYSTEM_PROVIDER,
+ FILEOP_COPY_EXTERNAL_PROVIDER,
+ FILEOP_MOVE_INTRA_PROVIDER,
+ FILEOP_MOVE_SYSTEM_PROVIDER,
+ FILEOP_MOVE_EXTERNAL_PROVIDER,
+ FILEOP_DELETE,
+ FILEOP_OTHER_ERROR,
+ FILEOP_COPY_ERROR,
+ FILEOP_MOVE_ERROR,
+ FILEOP_DELETE_ERROR
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface FileOp {}
+
+ // Codes representing different provider types. Used for sorting file operations when logging.
+ private static final int PROVIDER_INTRA = 0;
+ private static final int PROVIDER_SYSTEM = 1;
+ private static final int PROVIDER_EXTERNAL = 2;
+
+ @IntDef(flag = true, value = {
+ PROVIDER_INTRA,
+ PROVIDER_SYSTEM,
+ PROVIDER_EXTERNAL
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface Provider {}
+
/**
* Logs when DocumentsUI is started, and how. Call this when DocumentsUI first starts up.
*
@@ -140,6 +233,99 @@
}
/**
+ * Logs file operation stats. Call this when a file operation has completed. The given
+ * DocumentInfo is only used to distinguish broad categories of actions (e.g. copying from one
+ * provider to another vs copying within a given provider). No PII is logged.
+ *
+ * @param context
+ * @param operationType
+ * @param srcs
+ * @param dst
+ */
+ public static void logFileOperation(
+ Context context,
+ @OpType int operationType,
+ List<DocumentInfo> srcs,
+ @Nullable DocumentInfo dst) {
+ ProviderCounts counts = countProviders(srcs, dst);
+
+ if (counts.intraProvider > 0) {
+ logIntraProviderFileOps(context, dst.authority, operationType);
+ }
+ if (counts.systemProvider > 0) {
+ // Log file operations on system providers.
+ logInterProviderFileOps(context, COUNT_FILEOP_SYSTEM, dst, operationType);
+ }
+ if (counts.externalProvider > 0) {
+ // Log file operations on external providers.
+ logInterProviderFileOps(context, COUNT_FILEOP_EXTERNAL, dst, operationType);
+ }
+ }
+
+ /**
+ * Logs some kind of file operation error. Call this when a file operation (e.g. copy, delete)
+ * fails.
+ *
+ * @param context
+ * @param operationType
+ * @param failedFiles
+ */
+ public static void logFileOperationErrors(Context context, @OpType int operationType,
+ List<DocumentInfo> failedFiles) {
+ ProviderCounts counts = countProviders(failedFiles, null);
+
+ @FileOp int opCode = FILEOP_OTHER_ERROR;
+ switch (operationType) {
+ case FileOperationService.OPERATION_COPY:
+ opCode = FILEOP_COPY_ERROR;
+ break;
+ case FileOperationService.OPERATION_DELETE:
+ opCode = FILEOP_DELETE_ERROR;
+ break;
+ case FileOperationService.OPERATION_MOVE:
+ opCode = FILEOP_MOVE_ERROR;
+ break;
+ }
+ if (counts.systemProvider > 0) {
+ logHistogram(context, COUNT_FILEOP_SYSTEM, opCode);
+ }
+ if (counts.externalProvider > 0) {
+ logHistogram(context, COUNT_FILEOP_EXTERNAL, opCode);
+ }
+ }
+
+ /**
+ * Log the cancellation of a file operation. Call this when a Job is canceled.
+ * @param context
+ * @param operationType
+ */
+ public static void logFileOperationCancelled(Context context, @OpType int operationType) {
+ logHistogram(context, COUNT_FILEOP_CANCELED, operationType);
+ }
+
+ private static void logInterProviderFileOps(
+ Context context,
+ String histogram,
+ DocumentInfo dst,
+ @OpType int operationType) {
+ if (operationType == FileOperationService.OPERATION_DELETE) {
+ logHistogram(context, histogram, FILEOP_DELETE);
+ } else {
+ checkArgument(dst != null);
+ @Provider int providerType =
+ isSystemProvider(dst.authority) ? PROVIDER_SYSTEM : PROVIDER_EXTERNAL;
+ logHistogram(context, histogram, getOpCode(operationType, providerType));
+ }
+ }
+
+ private static void logIntraProviderFileOps(
+ Context context, String authority, @OpType int operationType) {
+ // Find the right histogram to log to, then log the operation.
+ String histogram = isSystemProvider(authority) ? COUNT_FILEOP_SYSTEM : COUNT_FILEOP_EXTERNAL;
+ logHistogram(context, histogram, getOpCode(operationType, PROVIDER_INTRA));
+ }
+
+ /**
* Internal method for making a MetricsLogger.count call. Increments the given counter by 1.
*
* @param context
@@ -167,7 +353,7 @@
* small set of hard-coded roots (ones provided by the system). Other roots are all grouped into
* a single ROOT_OTHER bucket.
*/
- private static int sanitizeRoot(Uri uri) {
+ private static @Root int sanitizeRoot(Uri uri) {
if (LauncherActivity.isLaunchUri(uri)) {
return ROOT_NONE;
}
@@ -192,13 +378,15 @@
}
case AUTHORITY_DOWNLOADS:
return ROOT_DOWNLOADS;
+ case AUTHORITY_MTP:
+ return ROOT_MTP;
default:
return ROOT_OTHER;
}
}
/** @see #sanitizeRoot(Uri) */
- private static int sanitizeRoot(RootInfo root) {
+ private static @Root int sanitizeRoot(RootInfo root) {
if (root.isRecents()) {
// Recents root is special and only identifiable via this method call. Other roots are
// identified by URI.
@@ -209,7 +397,7 @@
}
/** @see #sanitizeRoot(Uri) */
- private static int sanitizeRoot(ResolveInfo info) {
+ private static @Root int sanitizeRoot(ResolveInfo info) {
// Log all apps under a single bucket in the roots histogram.
return ROOT_THIRD_PARTY_APP;
}
@@ -221,7 +409,7 @@
* @param mimeType
* @return
*/
- private static int sanitizeMime(String mimeType) {
+ private static @Mime int sanitizeMime(String mimeType) {
if (mimeType == null) {
return MIME_NONE;
} else if ("*/*".equals(mimeType)) {
@@ -248,4 +436,75 @@
// Bucket all other types into one bucket.
return MIME_OTHER;
}
+
+ private static boolean isSystemProvider(String authority) {
+ switch (authority) {
+ case AUTHORITY_MEDIA:
+ case AUTHORITY_STORAGE:
+ case AUTHORITY_DOWNLOADS:
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ /**
+ * @param operation
+ * @param providerType
+ * @return An opcode, suitable for use as histogram bucket, for the given operation/provider
+ * combination.
+ */
+ private static @FileOp int getOpCode(@OpType int operation, @Provider int providerType) {
+ switch (operation) {
+ case FileOperationService.OPERATION_COPY:
+ switch (providerType) {
+ case PROVIDER_INTRA:
+ return FILEOP_COPY_INTRA_PROVIDER;
+ case PROVIDER_SYSTEM:
+ return FILEOP_COPY_SYSTEM_PROVIDER;
+ case PROVIDER_EXTERNAL:
+ return FILEOP_COPY_EXTERNAL_PROVIDER;
+ }
+ case FileOperationService.OPERATION_MOVE:
+ switch (providerType) {
+ case PROVIDER_INTRA:
+ return FILEOP_MOVE_INTRA_PROVIDER;
+ case PROVIDER_SYSTEM:
+ return FILEOP_MOVE_SYSTEM_PROVIDER;
+ case PROVIDER_EXTERNAL:
+ return FILEOP_MOVE_EXTERNAL_PROVIDER;
+ }
+ case FileOperationService.OPERATION_DELETE:
+ return FILEOP_DELETE;
+ default:
+ Log.w(TAG, "Unrecognized operation type when logging a file operation");
+ return FILEOP_OTHER;
+ }
+ }
+
+ /**
+ * Count the given src documents and provide a tally of how many come from the same provider as
+ * the dst document (if a dst is provided), how many come from system providers, and how many
+ * come from external 3rd-party providers.
+ */
+ private static ProviderCounts countProviders(
+ List<DocumentInfo> srcs, @Nullable DocumentInfo dst) {
+ ProviderCounts counts = new ProviderCounts();
+ for (DocumentInfo doc: srcs) {
+ if (dst != null && doc.authority.equals(dst.authority)) {
+ counts.intraProvider++;
+ } else if (isSystemProvider(doc.authority)){
+ counts.systemProvider++;
+ } else {
+ counts.externalProvider++;
+ }
+ }
+ return counts;
+ }
+
+ private static class ProviderCounts {
+ int intraProvider;
+ int systemProvider;
+ int externalProvider;
+ }
}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
index f57aa4b..2aabc99 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -642,10 +642,7 @@
return true;
case R.id.menu_copy_to_clipboard:
- if (!selection.isEmpty()) {
- copySelectionToClipboard(selection);
- mode.finish();
- }
+ copySelectedToClipboard();
return true;
case R.id.menu_select_all:
@@ -664,6 +661,15 @@
}
}
+ public final boolean onBackPressed() {
+ if (mSelectionManager.hasSelection()) {
+ if (DEBUG) Log.d(TAG, "Clearing selection on back pressed.");
+ mSelectionManager.clearSelection();
+ return true;
+ }
+ return false;
+ }
+
private void cancelThumbnailTask(View view) {
final ImageView iconThumb = (ImageView) view.findViewById(R.id.icon_thumb);
if (iconThumb != null) {
@@ -993,6 +999,7 @@
Selection selection = mSelectionManager.getSelection(new Selection());
if (!selection.isEmpty()) {
copySelectionToClipboard(selection);
+ mSelectionManager.clearSelection();
}
}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/IconHelper.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/IconHelper.java
index c97c446..53ed62e 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/IconHelper.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/IconHelper.java
@@ -19,7 +19,6 @@
import static com.android.documentsui.Shared.DEBUG;
import static com.android.documentsui.State.MODE_GRID;
import static com.android.documentsui.State.MODE_LIST;
-import static com.android.documentsui.State.MODE_UNKNOWN;
import android.content.ContentProviderClient;
import android.content.ContentResolver;
@@ -53,7 +52,9 @@
public class IconHelper {
private static String TAG = "IconHelper";
- private Context mContext;
+ private final Context mContext;
+
+ // Updated when icon size is set.
private ThumbnailCache mCache;
private Point mThumbSize;
// The display mode (MODE_GRID, MODE_LIST, etc).
@@ -85,8 +86,13 @@
* @param mode See {@link State.MODE_LIST} and {@link State.MODE_GRID}.
*/
public void setViewMode(@ViewMode int mode) {
- // TODO: Instead of exposing setMode, make the mode final, and make separate instances for
- // grid/list.
+ mMode = mode;
+ int thumbSize = getThumbSize(mode);
+ mThumbSize = new Point(thumbSize, thumbSize);
+ mCache = DocumentsApplication.getThumbnailsCache(mContext, mThumbSize);
+ }
+
+ private int getThumbSize(int mode) {
int thumbSize;
switch (mode) {
case MODE_GRID:
@@ -99,8 +105,7 @@
default:
throw new IllegalArgumentException("Unsupported layout mode: " + mode);
}
- mMode = mode;
- mThumbSize = new Point(thumbSize, thumbSize);
+ return thumbSize;
}
/**
diff --git a/packages/DocumentsUI/src/com/android/documentsui/services/CopyJob.java b/packages/DocumentsUI/src/com/android/documentsui/services/CopyJob.java
index e5e66f8..7c08ba7 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/services/CopyJob.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/services/CopyJob.java
@@ -50,6 +50,7 @@
import android.util.Log;
import android.webkit.MimeTypeMap;
+import com.android.documentsui.Metrics;
import com.android.documentsui.R;
import com.android.documentsui.model.DocumentInfo;
import com.android.documentsui.model.DocumentStack;
@@ -214,10 +215,9 @@
mBatchSize = calculateSize(mSrcs);
DocumentInfo srcInfo;
- DocumentInfo dstInfo;
+ DocumentInfo dstInfo = stack.peek();
for (int i = 0; i < mSrcs.size() && !isCanceled(); ++i) {
srcInfo = mSrcs.get(i);
- dstInfo = stack.peek();
// Guard unsupported recursive operation.
if (dstInfo.equals(srcInfo) || isDescendentOf(srcInfo, dstInfo)) {
@@ -232,6 +232,7 @@
processDocument(srcInfo, null, dstInfo);
}
+ Metrics.logFileOperation(service, operationType, mSrcs, dstInfo);
}
@Override
diff --git a/packages/DocumentsUI/src/com/android/documentsui/services/DeleteJob.java b/packages/DocumentsUI/src/com/android/documentsui/services/DeleteJob.java
index 24eb987..11c3a29 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/services/DeleteJob.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/services/DeleteJob.java
@@ -25,6 +25,7 @@
import android.os.RemoteException;
import android.util.Log;
+import com.android.documentsui.Metrics;
import com.android.documentsui.R;
import com.android.documentsui.model.DocumentInfo;
import com.android.documentsui.model.DocumentStack;
@@ -90,6 +91,7 @@
onFileFailed(doc);
}
}
+ Metrics.logFileOperation(service, operationType, mSrcs, null);
}
@Override
diff --git a/packages/DocumentsUI/src/com/android/documentsui/services/Job.java b/packages/DocumentsUI/src/com/android/documentsui/services/Job.java
index 7b8011a..f2c8763 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/services/Job.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/services/Job.java
@@ -41,6 +41,7 @@
import android.util.Log;
import com.android.documentsui.FilesActivity;
+import com.android.documentsui.Metrics;
import com.android.documentsui.OperationDialogFragment;
import com.android.documentsui.R;
import com.android.documentsui.Shared;
@@ -114,6 +115,7 @@
// ensure the service is shut down and notifications
// shown/closed.
Log.e(TAG, "Operation failed due to an exception.", e);
+ Metrics.logFileOperationErrors(service, operationType, failedFiles);
} finally {
listener.onFinished(this);
}
@@ -150,6 +152,7 @@
final void cancel() {
mCanceled = true;
+ Metrics.logFileOperationCancelled(service, operationType);
}
final boolean isCanceled() {
diff --git a/packages/MtpDocumentsProvider/AndroidManifest.xml b/packages/MtpDocumentsProvider/AndroidManifest.xml
index 2090d20..7ea54c9 100644
--- a/packages/MtpDocumentsProvider/AndroidManifest.xml
+++ b/packages/MtpDocumentsProvider/AndroidManifest.xml
@@ -15,14 +15,31 @@
<action android:name="android.content.action.DOCUMENTS_PROVIDER" />
</intent-filter>
</provider>
+
<service android:name=".MtpDocumentsService" />
- <receiver android:name=".UsbIntentReceiver" android:exported="true">
+
+ <activity android:name=".ReceiverActivity"
+ android:theme="@android:style/Theme.NoDisplay"
+ android:screenOrientation="locked"
+ android:excludeFromRecents="true">
<intent-filter>
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
- <action android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" />
</intent-filter>
<meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
- android:resource="@xml/device_filter" />
+ android:resource="@xml/device_filter" />
+ </activity>
+
+ <receiver android:name=".UsbIntentReceiver" android:exported="true">
+ <!-- TODO: Remove an intent-filter for USB_DEVICE_ATTACHED after the provider becomes to
+ open devices on demand. -->
+ <intent-filter>
+ <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
+ </intent-filter>
+ <meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
+ android:resource="@xml/device_filter" />
+ <intent-filter>
+ <action android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" />
+ </intent-filter>
</receiver>
</application>
</manifest>
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java
index 112914e..959fac6 100644
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java
@@ -165,22 +165,27 @@
cursor.close();
}
- long capacityBytes = 0;
- long availableBytes = 0;
- int capacityIndex = cursor.getColumnIndex(Root.COLUMN_CAPACITY_BYTES);
- int availableIndex = cursor.getColumnIndex(Root.COLUMN_AVAILABLE_BYTES);
- while (storageCursor.moveToNext()) {
- // If requested columnNames does not include COLUMN_XXX_BYTES, we don't
- // calculate corresponding values.
- if (capacityIndex != -1) {
- capacityBytes += cursor.getLong(capacityIndex);
+ if (storageCursor.getCount() != 0) {
+ long capacityBytes = 0;
+ long availableBytes = 0;
+ int capacityIndex = cursor.getColumnIndex(Root.COLUMN_CAPACITY_BYTES);
+ int availableIndex = cursor.getColumnIndex(Root.COLUMN_AVAILABLE_BYTES);
+ while (storageCursor.moveToNext()) {
+ // If requested columnNames does not include COLUMN_XXX_BYTES, we
+ // don't calculate corresponding values.
+ if (capacityIndex != -1) {
+ capacityBytes += cursor.getLong(capacityIndex);
+ }
+ if (availableIndex != -1) {
+ availableBytes += cursor.getLong(availableIndex);
+ }
}
- if (availableIndex != -1) {
- availableBytes += cursor.getLong(availableIndex);
- }
+ values.put(Root.COLUMN_CAPACITY_BYTES, capacityBytes);
+ values.put(Root.COLUMN_AVAILABLE_BYTES, availableBytes);
+ } else {
+ values.putNull(Root.COLUMN_CAPACITY_BYTES);
+ values.putNull(Root.COLUMN_AVAILABLE_BYTES);
}
- values.put(Root.COLUMN_CAPACITY_BYTES, capacityBytes);
- values.put(Root.COLUMN_AVAILABLE_BYTES, availableBytes);
}
} finally {
storageCursor.close();
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/ReceiverActivity.java b/packages/MtpDocumentsProvider/src/com/android/mtp/ReceiverActivity.java
new file mode 100644
index 0000000..c7206a7
--- /dev/null
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/ReceiverActivity.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mtp;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.hardware.usb.UsbManager;
+import android.os.Bundle;
+
+/**
+ * Invisible activity to receive intents.
+ * To show Files app for the UsbManager.ACTION_USB_DEVICE_ATTACHED intent, the intent should be
+ * received by activity. The activity has NoDisplay theme and immediately terminate after routing
+ * intent to DocumentsUI.
+ */
+public class ReceiverActivity extends Activity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ if (UsbManager.ACTION_USB_DEVICE_ATTACHED.equals(getIntent().getAction())) {
+ // TODO: To obtain data URI for the attached device, we need to wait until RootScanner
+ // found the device and add it to database. Set correct root URI, and use ACTION_BROWSE
+ // to launch Documents UI.
+ final Intent intent = new Intent(Intent.ACTION_MAIN);
+ intent.addCategory(Intent.CATEGORY_LAUNCHER);
+ intent.setComponent(new ComponentName(
+ "com.android.documentsui", "com.android.documentsui.LauncherActivity"));
+ this.startActivity(intent);
+ }
+ finish();
+ }
+}
diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java
index 97ea717..8075999 100644
--- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java
+++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java
@@ -899,4 +899,24 @@
mDatabase.getMapper().stopAddingDocuments(null);
assertEquals("1", mDatabase.getDocumentIdForDevice(100));
}
+
+ public void testGetClosedDevice() {
+ mDatabase.getMapper().startAddingDocuments(null);
+ mDatabase.getMapper().putDeviceDocument(new MtpDeviceRecord(
+ 0, "Device", /* opened is */ false , new MtpRoot[0], null, null));
+ mDatabase.getMapper().stopAddingDocuments(null);
+
+ final String[] columns = new String [] {
+ DocumentsContract.Root.COLUMN_ROOT_ID,
+ DocumentsContract.Root.COLUMN_TITLE,
+ DocumentsContract.Root.COLUMN_AVAILABLE_BYTES
+ };
+ try (final Cursor cursor = mDatabase.queryRoots(columns)) {
+ assertEquals(1, cursor.getCount());
+ assertTrue(cursor.moveToNext());
+ assertEquals(1, cursor.getLong(0));
+ assertEquals("Device", cursor.getString(1));
+ assertTrue(cursor.isNull(2));
+ }
+ }
}
diff --git a/packages/PrintSpooler/res/layout/print_activity.xml b/packages/PrintSpooler/res/layout/print_activity.xml
index a2f710d..2db6fb0 100644
--- a/packages/PrintSpooler/res/layout/print_activity.xml
+++ b/packages/PrintSpooler/res/layout/print_activity.xml
@@ -125,8 +125,8 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/preview_content"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:clipToPadding="false"
android:orientation="vertical">
</android.support.v7.widget.RecyclerView>
diff --git a/packages/SettingsLib/res/values-af/strings.xml b/packages/SettingsLib/res/values-af/strings.xml
index e7ae858..a7bed29 100644
--- a/packages/SettingsLib/res/values-af/strings.xml
+++ b/packages/SettingsLib/res/values-af/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Laai nie"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Laai nie"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Vol"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Gedeaktiveer deur administrateur"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-am/strings.xml b/packages/SettingsLib/res/values-am/strings.xml
index beac0a1..ed91fbe 100644
--- a/packages/SettingsLib/res/values-am/strings.xml
+++ b/packages/SettingsLib/res/values-am/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"ባትሪ እየሞላ አይደለም"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"ኃይል እየሞላ አይደለም"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"ሙሉነው"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"በአስተዳዳሪ የተሰናከለ"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-ar/strings.xml b/packages/SettingsLib/res/values-ar/strings.xml
index 2386cb6..11b4012 100644
--- a/packages/SettingsLib/res/values-ar/strings.xml
+++ b/packages/SettingsLib/res/values-ar/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"لا يتم الشحن"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"لا يتم الشحن"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"ممتلئة"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"تم التعطيل بواسطة المشرف"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-az-rAZ/strings.xml b/packages/SettingsLib/res/values-az-rAZ/strings.xml
index 273ea30..25bf1d9 100644
--- a/packages/SettingsLib/res/values-az-rAZ/strings.xml
+++ b/packages/SettingsLib/res/values-az-rAZ/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Doldurulmur"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Enerji doldurulmur"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Tam"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Administrator tərəfindən deaktiv edildi"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml
index 4f95052..ba3e4d2 100644
--- a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml
+++ b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Ne puni se"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ne puni se"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Puno"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Onemogućio je administrator"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-bg/strings.xml b/packages/SettingsLib/res/values-bg/strings.xml
index 74c58a5..e7aee37 100644
--- a/packages/SettingsLib/res/values-bg/strings.xml
+++ b/packages/SettingsLib/res/values-bg/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Не се зарежда"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не се зарежда"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Пълна"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Деактивирано от администратора"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-bn-rBD/strings.xml b/packages/SettingsLib/res/values-bn-rBD/strings.xml
index 9e42f71..b82e0aa 100644
--- a/packages/SettingsLib/res/values-bn-rBD/strings.xml
+++ b/packages/SettingsLib/res/values-bn-rBD/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"চার্জ হচ্ছে না"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"চার্জ হচ্ছে না"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"পূর্ণ"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"প্রশাসক দ্বারা অক্ষমিত"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-bs-rBA/strings.xml b/packages/SettingsLib/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..a3b540d
--- /dev/null
+++ b/packages/SettingsLib/res/values-bs-rBA/strings.xml
@@ -0,0 +1,481 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2015 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- no translation found for wifi_fail_to_scan (1265540342578081461) -->
+ <skip />
+ <!-- no translation found for wifi_security_none (7985461072596594400) -->
+ <skip />
+ <!-- no translation found for wifi_remembered (4955746899347821096) -->
+ <skip />
+ <!-- no translation found for wifi_disabled_generic (4259794910584943386) -->
+ <skip />
+ <!-- no translation found for wifi_disabled_network_failure (2364951338436007124) -->
+ <skip />
+ <!-- no translation found for wifi_disabled_wifi_failure (3081668066612876581) -->
+ <skip />
+ <!-- no translation found for wifi_disabled_password_failure (8659805351763133575) -->
+ <skip />
+ <!-- no translation found for wifi_not_in_range (1136191511238508967) -->
+ <skip />
+ <!-- no translation found for wifi_no_internet (9151470775868728896) -->
+ <skip />
+ <!-- no translation found for saved_network (4352716707126620811) -->
+ <skip />
+ <!-- no translation found for connected_via_wfa (3805736726317410714) -->
+ <skip />
+ <!-- no translation found for connected_via_passpoint (2826205693803088747) -->
+ <skip />
+ <!-- no translation found for available_via_passpoint (1617440946846329613) -->
+ <skip />
+ <!-- no translation found for wifi_connected_no_internet (3149853966840874992) -->
+ <skip />
+ <!-- no translation found for bluetooth_disconnected (6557104142667339895) -->
+ <skip />
+ <!-- no translation found for bluetooth_disconnecting (8913264760027764974) -->
+ <skip />
+ <!-- no translation found for bluetooth_connecting (8555009514614320497) -->
+ <skip />
+ <!-- no translation found for bluetooth_connected (6038755206916626419) -->
+ <skip />
+ <!-- no translation found for bluetooth_pairing (1426882272690346242) -->
+ <skip />
+ <!-- no translation found for bluetooth_connected_no_headset (2866994875046035609) -->
+ <skip />
+ <!-- no translation found for bluetooth_connected_no_a2dp (4576188601581440337) -->
+ <skip />
+ <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+ <skip />
+ <!-- no translation found for bluetooth_connected_no_headset_no_a2dp (9195757766755553810) -->
+ <skip />
+ <!-- no translation found for bluetooth_profile_a2dp (2031475486179830674) -->
+ <skip />
+ <!-- no translation found for bluetooth_profile_headset (8658779596261212609) -->
+ <skip />
+ <!-- no translation found for bluetooth_profile_opp (9168139293654233697) -->
+ <skip />
+ <!-- no translation found for bluetooth_profile_hid (3680729023366986480) -->
+ <skip />
+ <!-- no translation found for bluetooth_profile_pan (3391606497945147673) -->
+ <skip />
+ <!-- no translation found for bluetooth_profile_pbap (5372051906968576809) -->
+ <skip />
+ <!-- no translation found for bluetooth_profile_pbap_summary (6605229608108852198) -->
+ <skip />
+ <!-- no translation found for bluetooth_profile_pan_nap (8429049285027482959) -->
+ <skip />
+ <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+ <skip />
+ <!-- no translation found for bluetooth_profile_sap (5764222021851283125) -->
+ <skip />
+ <!-- no translation found for bluetooth_a2dp_profile_summary_connected (963376081347721598) -->
+ <skip />
+ <!-- no translation found for bluetooth_headset_profile_summary_connected (7661070206715520671) -->
+ <skip />
+ <!-- no translation found for bluetooth_opp_profile_summary_connected (2611913495968309066) -->
+ <skip />
+ <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+ <skip />
+ <!-- no translation found for bluetooth_sap_profile_summary_connected (8561765057453083838) -->
+ <skip />
+ <!-- no translation found for bluetooth_opp_profile_summary_not_connected (1267091356089086285) -->
+ <skip />
+ <!-- no translation found for bluetooth_hid_profile_summary_connected (3381760054215168689) -->
+ <skip />
+ <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Pov. na ur. za pris. int."</string>
+ <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Dij. lok. int. veze s ur."</string>
+ <!-- no translation found for bluetooth_pan_profile_summary_use_for (5664884523822068653) -->
+ <skip />
+ <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+ <skip />
+ <!-- no translation found for bluetooth_sap_profile_summary_use_for (7085362712786907993) -->
+ <skip />
+ <!-- no translation found for bluetooth_a2dp_profile_summary_use_for (4630849022250168427) -->
+ <skip />
+ <!-- no translation found for bluetooth_headset_profile_summary_use_for (8705753622443862627) -->
+ <skip />
+ <!-- no translation found for bluetooth_opp_profile_summary_use_for (1255674547144769756) -->
+ <skip />
+ <!-- no translation found for bluetooth_hid_profile_summary_use_for (232727040453645139) -->
+ <skip />
+ <!-- no translation found for bluetooth_pairing_accept (6163520056536604875) -->
+ <skip />
+ <!-- no translation found for bluetooth_pairing_accept_all_caps (6061699265220789149) -->
+ <skip />
+ <!-- no translation found for bluetooth_pairing_decline (4185420413578948140) -->
+ <skip />
+ <!-- no translation found for bluetooth_pairing_will_share_phonebook (4982239145676394429) -->
+ <skip />
+ <!-- no translation found for bluetooth_pairing_error_message (3748157733635947087) -->
+ <skip />
+ <!-- no translation found for bluetooth_pairing_pin_error_message (8337234855188925274) -->
+ <skip />
+ <!-- no translation found for bluetooth_pairing_device_down_error_message (7870998403045801381) -->
+ <skip />
+ <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
+ <skip />
+ <!-- no translation found for accessibility_wifi_off (1166761729660614716) -->
+ <skip />
+ <!-- no translation found for accessibility_no_wifi (8834610636137374508) -->
+ <skip />
+ <!-- no translation found for accessibility_wifi_one_bar (4869376278894301820) -->
+ <skip />
+ <!-- no translation found for accessibility_wifi_two_bars (3569851234710034416) -->
+ <skip />
+ <!-- no translation found for accessibility_wifi_three_bars (8134185644861380311) -->
+ <skip />
+ <!-- no translation found for accessibility_wifi_signal_full (7061045677694702) -->
+ <skip />
+ <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
+ <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Uklonjene aplikacije"</string>
+ <!-- no translation found for data_usage_uninstalled_apps_users (7986294489899813194) -->
+ <skip />
+ <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB dijeljenje veze"</string>
+ <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prenosna pristupna tačka"</string>
+ <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Dijeljenje Bluetooth veze"</string>
+ <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Dijeljenje veze"</string>
+ <string name="tether_settings_title_all" msgid="8356136101061143841">"Dijeljenje internetske veze i prenosna pristupna tačka"</string>
+ <!-- no translation found for managed_user_title (8101244883654409696) -->
+ <skip />
+ <!-- no translation found for user_guest (8475274842845401871) -->
+ <skip />
+ <string name="unknown" msgid="1592123443519355854">"Nepoznato"</string>
+ <string name="running_process_item_user_label" msgid="3129887865552025943">"Korisnik: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+ <!-- no translation found for launch_defaults_some (313159469856372621) -->
+ <skip />
+ <!-- no translation found for launch_defaults_none (4241129108140034876) -->
+ <skip />
+ <string name="tts_settings" msgid="8186971894801348327">"Postavke za pretvaranje teksta u govor"</string>
+ <string name="tts_settings_title" msgid="1237820681016639683">"Izlaz za pretvaranje teksta u govor"</string>
+ <string name="tts_default_rate_title" msgid="6030550998379310088">"Brzina govora"</string>
+ <string name="tts_default_rate_summary" msgid="4061815292287182801">"Brzina kojom se izgovara tekst"</string>
+ <string name="tts_default_lang_title" msgid="8018087612299820556">"Jezik"</string>
+ <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
+ <skip />
+ <!-- no translation found for tts_lang_not_selected (7395787019276734765) -->
+ <skip />
+ <string name="tts_default_lang_summary" msgid="5219362163902707785">"Postavlja glas za dati jezik za izgovoreni tekst"</string>
+ <string name="tts_play_example_title" msgid="7094780383253097230">"Poslušajte primjer"</string>
+ <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproduciraj kratku demonstraciju sintetiziranja govora"</string>
+ <string name="tts_install_data_title" msgid="4264378440508149986">"Instaliraj glasovne podatke"</string>
+ <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalirajte glasovne podatke potrebne za sintetiziranje govora"</string>
+ <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ovaj program za sintetiziranje govora može biti u mogućnosti da prikuplja sav tekst koji se izgovara, uključujući lične podatke kao što su lozinke i brojevi kreditnih kartica. Potiče od aplikacije <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Da li želite koristiti ovaj program za sintetiziranje govora?"</string>
+ <!-- no translation found for tts_engine_network_required (1190837151485314743) -->
+ <skip />
+ <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
+ <skip />
+ <!-- no translation found for tts_status_title (7268566550242584413) -->
+ <skip />
+ <!-- no translation found for tts_status_ok (1309762510278029765) -->
+ <skip />
+ <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
+ <skip />
+ <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
+ <skip />
+ <!-- no translation found for tts_status_checking (5339150797940483592) -->
+ <skip />
+ <string name="tts_engine_settings_title" msgid="3499112142425680334">"Postavke za <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
+ <string name="tts_engine_settings_button" msgid="1030512042040722285">"Pokreni postavke programa"</string>
+ <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Željeni program"</string>
+ <string name="tts_general_section_title" msgid="4402572014604490502">"Opće"</string>
+ <!-- no translation found for tts_rate_entries:0 (6695494874362656215) -->
+ <!-- no translation found for tts_rate_entries:1 (4795095314303559268) -->
+ <!-- no translation found for tts_rate_entries:2 (8903157781070679765) -->
+ <!-- no translation found for tts_rate_entries:3 (164347302621392996) -->
+ <!-- no translation found for tts_rate_entries:4 (5794028588101562009) -->
+ <!-- no translation found for tts_rate_entries:5 (7163942783888652942) -->
+ <!-- no translation found for tts_rate_entries:6 (7831712693748700507) -->
+ <!-- no translation found for tts_rate_entries:7 (5194774745031751806) -->
+ <!-- no translation found for tts_rate_entries:8 (9085102246155045744) -->
+ <!-- no translation found for choose_profile (8229363046053568878) -->
+ <skip />
+ <!-- no translation found for category_personal (1299663247844969448) -->
+ <skip />
+ <!-- no translation found for category_work (8699184680584175622) -->
+ <skip />
+ <string name="development_settings_title" msgid="215179176067683667">"Opcije za programere"</string>
+ <!-- no translation found for development_settings_enable (542530994778109538) -->
+ <skip />
+ <string name="development_settings_summary" msgid="1815795401632854041">"Postavi opcije za razvoj aplikacija"</string>
+ <!-- no translation found for development_settings_not_available (4308569041701535607) -->
+ <skip />
+ <!-- no translation found for vpn_settings_not_available (956841430176985598) -->
+ <skip />
+ <!-- no translation found for tethering_settings_not_available (6765770438438291012) -->
+ <skip />
+ <!-- no translation found for apn_settings_not_available (7873729032165324000) -->
+ <skip />
+ <string name="enable_adb" msgid="7982306934419797485">"USB otklanjanje grešaka"</string>
+ <string name="enable_adb_summary" msgid="4881186971746056635">"Način rada za uklanjanje grešaka kada je povezan USB"</string>
+ <!-- no translation found for clear_adb_keys (4038889221503122743) -->
+ <skip />
+ <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+ <skip />
+ <!-- no translation found for bugreport_in_power_summary (1778455732762984579) -->
+ <skip />
+ <string name="keep_screen_on" msgid="1146389631208760344">"Ostani aktivan"</string>
+ <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekran neće prelaziti u stanje mirovanja tokom punjenja"</string>
+ <!-- no translation found for bt_hci_snoop_log (3340699311158865670) -->
+ <skip />
+ <!-- no translation found for bt_hci_snoop_log_summary (730247028210113851) -->
+ <skip />
+ <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
+ <skip />
+ <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
+ <skip />
+ <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
+ <skip />
+ <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
+ <skip />
+ <!-- no translation found for mock_location_app (7966220972812881854) -->
+ <skip />
+ <!-- no translation found for mock_location_app_not_set (809543285495344223) -->
+ <skip />
+ <!-- no translation found for mock_location_app_set (8966420655295102685) -->
+ <skip />
+ <!-- no translation found for debug_networking_category (7044075693643009662) -->
+ <skip />
+ <!-- no translation found for wifi_display_certification (8611569543791307533) -->
+ <skip />
+ <!-- no translation found for wifi_verbose_logging (4203729756047242344) -->
+ <skip />
+ <!-- no translation found for wifi_aggressive_handover (9194078645887480917) -->
+ <skip />
+ <!-- no translation found for wifi_allow_scan_with_traffic (3601853081178265786) -->
+ <skip />
+ <!-- no translation found for legacy_dhcp_client (694426978909127287) -->
+ <skip />
+ <!-- no translation found for mobile_data_always_on (7745605759775320362) -->
+ <skip />
+ <!-- no translation found for wifi_display_certification_summary (1155182309166746973) -->
+ <skip />
+ <!-- no translation found for wifi_verbose_logging_summary (6615071616111731958) -->
+ <skip />
+ <!-- no translation found for wifi_aggressive_handover_summary (6328455667642570371) -->
+ <skip />
+ <!-- no translation found for wifi_allow_scan_with_traffic_summary (2575101424972686310) -->
+ <skip />
+ <!-- no translation found for select_logd_size_title (7433137108348553508) -->
+ <skip />
+ <!-- no translation found for select_logd_size_dialog_title (1206769310236476760) -->
+ <skip />
+ <!-- no translation found for select_usb_configuration_title (2649938511506971843) -->
+ <skip />
+ <!-- no translation found for select_usb_configuration_dialog_title (6385564442851599963) -->
+ <skip />
+ <string name="allow_mock_location" msgid="2787962564578664888">"Dozvoli lažne lokacije"</string>
+ <string name="allow_mock_location_summary" msgid="317615105156345626">"Dozvoli lažne lokacije"</string>
+ <!-- no translation found for debug_view_attributes (6485448367803310384) -->
+ <skip />
+ <!-- no translation found for legacy_dhcp_client_summary (163383566317652040) -->
+ <skip />
+ <!-- no translation found for mobile_data_always_on_summary (8149773901431697910) -->
+ <skip />
+ <string name="adb_warning_title" msgid="6234463310896563253">"Omogućiti USB otklanjanje grešaka?"</string>
+ <string name="adb_warning_message" msgid="7316799925425402244">"USB otklanjanje grešaka je namijenjeno samo u svrhe razvoja aplikacija. Koristite ga za kopiranje podataka između računara i uređaja, instaliranje aplikacija na uređaj bez obavještenja te čitanje podataka iz dnevnika rada."</string>
+ <!-- no translation found for adb_keys_warning_message (5659849457135841625) -->
+ <skip />
+ <string name="dev_settings_warning_title" msgid="7244607768088540165">"Dopustiti postavke za razvoj?"</string>
+ <string name="dev_settings_warning_message" msgid="2298337781139097964">"Ove postavke su namijenjene samo za svrhe razvoja. Mogu izazvati pogrešno ponašanje uređaja i aplikacija na njemu."</string>
+ <!-- no translation found for verify_apps_over_usb_title (4177086489869041953) -->
+ <skip />
+ <!-- no translation found for verify_apps_over_usb_summary (9164096969924529200) -->
+ <skip />
+ <!-- no translation found for enable_terminal_title (95572094356054120) -->
+ <skip />
+ <!-- no translation found for enable_terminal_summary (67667852659359206) -->
+ <skip />
+ <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP provjeravanje"</string>
+ <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Pos. ponaš. kod HDCP pr."</string>
+ <string name="debug_debugging_category" msgid="6781250159513471316">"Otklanjanje grešaka"</string>
+ <string name="debug_app" msgid="8349591734751384446">"Odaberi aplikaciju za otklanjanje grešaka"</string>
+ <string name="debug_app_not_set" msgid="718752499586403499">"Nema postavljenih aplikac. za otklanjanje grešaka"</string>
+ <string name="debug_app_set" msgid="2063077997870280017">"Aplikacija za otklanjanje grešaka: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+ <string name="select_application" msgid="5156029161289091703">"Odaberite aplikaciju"</string>
+ <string name="no_application" msgid="2813387563129153880">"Ništa"</string>
+ <string name="wait_for_debugger" msgid="1202370874528893091">"Pričekajte na program za otklanjanje grešaka"</string>
+ <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Aplikacija u kojoj se otklanjaju greške čeka da se priloži program za otklanjanje grešaka prije izvršavanja"</string>
+ <string name="debug_input_category" msgid="1811069939601180246">"Ulaz"</string>
+ <string name="debug_drawing_category" msgid="6755716469267367852">"Crtanje"</string>
+ <!-- no translation found for debug_hw_drawing_category (6220174216912308658) -->
+ <skip />
+ <!-- no translation found for media_category (4388305075496848353) -->
+ <skip />
+ <string name="debug_monitoring_category" msgid="7640508148375798343">"Praćenje"</string>
+ <string name="strict_mode" msgid="1938795874357830695">"Omogućen strogi režim"</string>
+ <string name="strict_mode_summary" msgid="142834318897332338">"Prikaži ekran uz treptanje kada aplikacije vrše duge operacije u glavnoj niti"</string>
+ <string name="pointer_location" msgid="6084434787496938001">"Lokacija pokazivača"</string>
+ <string name="pointer_location_summary" msgid="840819275172753713">"Trenutni podaci o dodirivanju prikazuje se u nadsloju preko ekrana"</string>
+ <string name="show_touches" msgid="1356420386500834339">"Prikaži dodire"</string>
+ <string name="show_touches_summary" msgid="6684407913145150041">"Prikaži vizuelne povratne informacije za dodire"</string>
+ <string name="show_screen_updates" msgid="5470814345876056420">"Prikaži ažuriranja za površinu"</string>
+ <string name="show_screen_updates_summary" msgid="2569622766672785529">"Prikazi cijele površine prozora uz treptanje prilikom ažuriranja"</string>
+ <string name="show_hw_screen_updates" msgid="5036904558145941590">"Pok. ažur. za GPU prikaz"</string>
+ <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Prikazi uz treptanje unutar prozora kada se crta koristeći GPU"</string>
+ <string name="show_hw_layers_updates" msgid="5645728765605699821">"Prikaži dodatne informacije za ažuriranja za hardver"</string>
+ <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Trepći hardverske slojeve zeleno kada se ažuriraju"</string>
+ <!-- no translation found for debug_hw_overdraw (2968692419951565417) -->
+ <skip />
+ <string name="disable_overlays" msgid="2074488440505934665">"Onemog. HW preklapanja"</string>
+ <string name="disable_overlays_summary" msgid="3578941133710758592">"Uvijek koristi GPU za kompoziciju ekrana"</string>
+ <!-- no translation found for simulate_color_space (6745847141353345872) -->
+ <skip />
+ <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
+ <skip />
+ <!-- no translation found for usb_audio_disable_routing (8114498436003102671) -->
+ <skip />
+ <!-- no translation found for usb_audio_disable_routing_summary (980282760277312264) -->
+ <skip />
+ <string name="debug_layout" msgid="5981361776594526155">"Prikaži granice rasporeda"</string>
+ <string name="debug_layout_summary" msgid="2001775315258637682">"Prikaži granice isječka, margine itd."</string>
+ <!-- no translation found for force_rtl_layout_all_locales (2259906643093138978) -->
+ <skip />
+ <!-- no translation found for force_rtl_layout_all_locales_summary (9192797796616132534) -->
+ <skip />
+ <string name="show_cpu_usage" msgid="2389212910758076024">"Prikaži korištenje CPU-a"</string>
+ <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Trenutno korištenje CPU-a prikazuje se u nadsloju preko ekrana"</string>
+ <string name="force_hw_ui" msgid="6426383462520888732">"Prisili GPU iscrtavanje"</string>
+ <string name="force_hw_ui_summary" msgid="5535991166074861515">"Prisilno koristite GPU za 2d crtanje"</string>
+ <!-- no translation found for force_msaa (7920323238677284387) -->
+ <skip />
+ <!-- no translation found for force_msaa_summary (9123553203895817537) -->
+ <skip />
+ <!-- no translation found for show_non_rect_clip (505954950474595172) -->
+ <skip />
+ <string name="track_frame_time" msgid="6146354853663863443">"Iscrtavanje GPU profila"</string>
+ <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala animacije prozora"</string>
+ <string name="transition_animation_scale_title" msgid="387527540523595875">"Skaliranje animacije prelaza"</string>
+ <string name="animator_duration_scale_title" msgid="3406722410819934083">"Skala trajanja animatora"</string>
+ <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simuliraj sekundarne ekrane"</string>
+ <string name="debug_applications_category" msgid="4206913653849771549">"Aplikacije"</string>
+ <!-- no translation found for immediately_destroy_activities (1579659389568133959) -->
+ <skip />
+ <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Obustavi svaku aktivnosti čim je korisnik napusti"</string>
+ <string name="app_process_limit_title" msgid="4280600650253107163">"Ograničenje procesa u pozadini"</string>
+ <string name="show_all_anrs" msgid="28462979638729082">"Prikaži sve ANR-ove"</string>
+ <string name="show_all_anrs_summary" msgid="641908614413544127">"Prik. dijalog Aplikacija ne reagira za apl. u poz."</string>
+ <!-- no translation found for force_allow_on_external (3215759785081916381) -->
+ <skip />
+ <!-- no translation found for force_allow_on_external_summary (3191952505860343233) -->
+ <skip />
+ <!-- no translation found for force_resizable_activities (8615764378147824985) -->
+ <skip />
+ <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
+ <skip />
+ <!-- no translation found for enable_freeform_support (1461893351278940416) -->
+ <skip />
+ <!-- no translation found for enable_freeform_support_summary (2252563497485436534) -->
+ <skip />
+ <string name="local_backup_password_title" msgid="3860471654439418822">"Lozinka za rezervnu kopiju za radnu površinu"</string>
+ <!-- no translation found for local_backup_password_summary_none (6951095485537767956) -->
+ <skip />
+ <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Dodirnite da promijenite ili uklonite lozinku za potpune rezervne kopije za radnu površinu"</string>
+ <string name="local_backup_password_toast_success" msgid="582016086228434290">"Nova lozinka za rezervnu kopiju postavljena"</string>
+ <!-- no translation found for local_backup_password_toast_confirmation_mismatch (7805892532752708288) -->
+ <skip />
+ <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Nije uspjelo postavljanje lozinke za rezervnu kopiju"</string>
+ <!-- no translation found for color_mode_names:0 (2425514299220523812) -->
+ <!-- no translation found for color_mode_names:1 (8446070607501413455) -->
+ <!-- no translation found for color_mode_names:2 (6553408765810699025) -->
+ <!-- no translation found for color_mode_descriptions:0 (4979629397075120893) -->
+ <!-- no translation found for color_mode_descriptions:1 (8280754435979370728) -->
+ <!-- no translation found for color_mode_descriptions:2 (5363960654009010371) -->
+ <!-- no translation found for inactive_apps_title (1317817863508274533) -->
+ <skip />
+ <!-- no translation found for inactive_app_inactive_summary (6768756967594202411) -->
+ <skip />
+ <!-- no translation found for inactive_app_active_summary (4512911571954375968) -->
+ <skip />
+ <string name="runningservices_settings_title" msgid="8097287939865165213">"Pokrenute usluge"</string>
+ <string name="runningservices_settings_summary" msgid="854608995821032748">"Prikažite trenutno pokrenute usluge i upravljajte njima"</string>
+ <!-- no translation found for night_mode_title (2594133148531256513) -->
+ <skip />
+ <!-- no translation found for night_mode_summary (9196605054622017193) -->
+ <skip />
+ <!-- no translation found for night_mode_no (9171772244775838901) -->
+ <skip />
+ <!-- no translation found for night_mode_yes (2218157265997633432) -->
+ <skip />
+ <!-- no translation found for night_mode_auto (7508348175804304327) -->
+ <skip />
+ <!-- no translation found for select_webview_provider_title (4628592979751918907) -->
+ <skip />
+ <!-- no translation found for select_webview_provider_dialog_title (4370551378720004872) -->
+ <skip />
+ <!-- no translation found for select_webview_provider_confirmation_text (6671472080671066972) -->
+ <skip />
+ <!-- no translation found for convert_to_file_encryption (3060156730651061223) -->
+ <skip />
+ <!-- no translation found for convert_to_file_encryption_enabled (2861258671151428346) -->
+ <skip />
+ <!-- no translation found for convert_to_file_encryption_done (7859766358000523953) -->
+ <skip />
+ <!-- no translation found for title_convert_fbe (1263622876196444453) -->
+ <skip />
+ <!-- no translation found for convert_to_fbe_warning (6139067817148865527) -->
+ <skip />
+ <!-- no translation found for button_convert_fbe (5152671181309826405) -->
+ <skip />
+ <!-- no translation found for picture_color_mode (4560755008730283695) -->
+ <skip />
+ <!-- no translation found for picture_color_mode_desc (1141891467675548590) -->
+ <skip />
+ <!-- no translation found for daltonizer_mode_disabled (7482661936053801862) -->
+ <skip />
+ <!-- no translation found for daltonizer_mode_monochromacy (8485709880666106721) -->
+ <skip />
+ <!-- no translation found for daltonizer_mode_deuteranomaly (5475532989673586329) -->
+ <skip />
+ <!-- no translation found for daltonizer_mode_protanomaly (8424148009038666065) -->
+ <skip />
+ <!-- no translation found for daltonizer_mode_tritanomaly (481725854987912389) -->
+ <skip />
+ <!-- no translation found for accessibility_display_daltonizer_preference_title (5800761362678707872) -->
+ <skip />
+ <!-- no translation found for accessibility_display_daltonizer_preference_subtitle (3484969015295282911) -->
+ <skip />
+ <!-- no translation found for daltonizer_type_overridden (3116947244410245916) -->
+ <skip />
+ <!-- no translation found for power_discharging_duration (1605929174734600590) -->
+ <skip />
+ <!-- no translation found for power_charging (1779532561355864267) -->
+ <skip />
+ <!-- no translation found for power_charging_duration (2853265177761520490) -->
+ <skip />
+ <!-- no translation found for power_charging_duration_ac (3969186192576594254) -->
+ <skip />
+ <!-- no translation found for power_charging_duration_usb (182405645340976546) -->
+ <skip />
+ <!-- no translation found for power_charging_duration_wireless (1829295708243159464) -->
+ <skip />
+ <string name="battery_info_status_unknown" msgid="196130600938058547">"Nepoznato"</string>
+ <string name="battery_info_status_charging" msgid="1705179948350365604">"Puni se"</string>
+ <!-- no translation found for battery_info_status_charging_ac (2909861890674399949) -->
+ <skip />
+ <!-- no translation found for battery_info_status_charging_usb (2207489369680923929) -->
+ <skip />
+ <!-- no translation found for battery_info_status_charging_wireless (3574032603735446573) -->
+ <skip />
+ <string name="battery_info_status_discharging" msgid="310932812698268588">"Ne puni se"</string>
+ <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ne puni se"</string>
+ <string name="battery_info_status_full" msgid="2824614753861462808">"Puna"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Onemogućio administrator"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ca/strings.xml b/packages/SettingsLib/res/values-ca/strings.xml
index 2f81098..e837ae6 100644
--- a/packages/SettingsLib/res/values-ca/strings.xml
+++ b/packages/SettingsLib/res/values-ca/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"No s\'està carregant"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"No s\'està carregant"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Plena"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Opció desactivada per l\'administrador"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-cs/strings.xml b/packages/SettingsLib/res/values-cs/strings.xml
index f1c9e27..e1f9266 100644
--- a/packages/SettingsLib/res/values-cs/strings.xml
+++ b/packages/SettingsLib/res/values-cs/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Nenabíjí se"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nenabíjí se"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Nabitá"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Zakázáno administrátorem"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-da/strings.xml b/packages/SettingsLib/res/values-da/strings.xml
index 90ea69a..62f920c 100644
--- a/packages/SettingsLib/res/values-da/strings.xml
+++ b/packages/SettingsLib/res/values-da/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Oplader ikke"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Oplader ikke"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Fuld"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Deaktiveret af administratoren"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-de/strings.xml b/packages/SettingsLib/res/values-de/strings.xml
index f768dc3..a14cf3e 100644
--- a/packages/SettingsLib/res/values-de/strings.xml
+++ b/packages/SettingsLib/res/values-de/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Wird nicht geladen"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Wird nicht geladen"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Voll"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Vom Administrator deaktiviert"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-el/strings.xml b/packages/SettingsLib/res/values-el/strings.xml
index dddd780..3fbe9bb 100644
--- a/packages/SettingsLib/res/values-el/strings.xml
+++ b/packages/SettingsLib/res/values-el/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Δεν φορτίζει"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Δεν φορτίζει"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Πλήρης"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Απενεργοποιήθηκε από το διαχειριστή"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-en-rAU/strings.xml b/packages/SettingsLib/res/values-en-rAU/strings.xml
index b938ace..9c11343 100644
--- a/packages/SettingsLib/res/values-en-rAU/strings.xml
+++ b/packages/SettingsLib/res/values-en-rAU/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Not charging"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Not charging"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Disabled by administrator"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-en-rGB/strings.xml b/packages/SettingsLib/res/values-en-rGB/strings.xml
index b938ace..9c11343 100644
--- a/packages/SettingsLib/res/values-en-rGB/strings.xml
+++ b/packages/SettingsLib/res/values-en-rGB/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Not charging"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Not charging"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Disabled by administrator"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-en-rIN/strings.xml b/packages/SettingsLib/res/values-en-rIN/strings.xml
index b938ace..9c11343 100644
--- a/packages/SettingsLib/res/values-en-rIN/strings.xml
+++ b/packages/SettingsLib/res/values-en-rIN/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Not charging"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Not charging"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Disabled by administrator"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-es-rUS/strings.xml b/packages/SettingsLib/res/values-es-rUS/strings.xml
index ea97ada..fafccf8 100644
--- a/packages/SettingsLib/res/values-es-rUS/strings.xml
+++ b/packages/SettingsLib/res/values-es-rUS/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"No se está cargando."</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"No se realiza la carga"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Cargado"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Inhabilitada por el administrador"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-es/strings.xml b/packages/SettingsLib/res/values-es/strings.xml
index 901dc25..3e52101 100644
--- a/packages/SettingsLib/res/values-es/strings.xml
+++ b/packages/SettingsLib/res/values-es/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"No se está cargando"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"No se está cargando"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Completa"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Inhabilitada por el administrador"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-et-rEE/strings.xml b/packages/SettingsLib/res/values-et-rEE/strings.xml
index 970812a..308dd0e 100644
--- a/packages/SettingsLib/res/values-et-rEE/strings.xml
+++ b/packages/SettingsLib/res/values-et-rEE/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Ei lae"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ei lae"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Täis"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Administraator on keelanud"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-eu-rES/strings.xml b/packages/SettingsLib/res/values-eu-rES/strings.xml
index 64a1410..aba1523 100644
--- a/packages/SettingsLib/res/values-eu-rES/strings.xml
+++ b/packages/SettingsLib/res/values-eu-rES/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Ez da kargatzen ari"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ez da kargatzen ari"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Beteta"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Administratzaileak desgaitu du"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-fa/strings.xml b/packages/SettingsLib/res/values-fa/strings.xml
index 5380651..6307ee8 100644
--- a/packages/SettingsLib/res/values-fa/strings.xml
+++ b/packages/SettingsLib/res/values-fa/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"شارژ نمیشود"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"شارژ نمیشود"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"پر"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"سرپرست آن را غیرفعال کرده است"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-fi/strings.xml b/packages/SettingsLib/res/values-fi/strings.xml
index 4b555ac..652e2b7 100644
--- a/packages/SettingsLib/res/values-fi/strings.xml
+++ b/packages/SettingsLib/res/values-fi/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Ei laturissa"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ei laturissa"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Täynnä"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Järjestelmänvalvojan käytöstä poistama"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-fr-rCA/strings.xml b/packages/SettingsLib/res/values-fr-rCA/strings.xml
index 96d2e7b..1be9849 100644
--- a/packages/SettingsLib/res/values-fr-rCA/strings.xml
+++ b/packages/SettingsLib/res/values-fr-rCA/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"N\'est pas en charge"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"N\'est pas en charge"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Pleine"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Désactivé par l\'administrateur"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-fr/strings.xml b/packages/SettingsLib/res/values-fr/strings.xml
index 6dabba8..9c1b89d 100644
--- a/packages/SettingsLib/res/values-fr/strings.xml
+++ b/packages/SettingsLib/res/values-fr/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Pas en charge"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Débranchée"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"pleine"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Désactivé par l\'administrateur"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-gl-rES/strings.xml b/packages/SettingsLib/res/values-gl-rES/strings.xml
index d3773f6..c56fd57 100644
--- a/packages/SettingsLib/res/values-gl-rES/strings.xml
+++ b/packages/SettingsLib/res/values-gl-rES/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Non se está cargando"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Non está cargando"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Completa"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Desactivado polo administrador"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-gu-rIN/strings.xml b/packages/SettingsLib/res/values-gu-rIN/strings.xml
index 9e2ec7e..b9ff7f5 100644
--- a/packages/SettingsLib/res/values-gu-rIN/strings.xml
+++ b/packages/SettingsLib/res/values-gu-rIN/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"ચાર્જ થઈ રહ્યું નથી"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"ચાર્જ થઈ રહ્યું નથી"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"પૂર્ણ"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"વ્યવસ્થાપક દ્વારા અક્ષમ"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-hi/strings.xml b/packages/SettingsLib/res/values-hi/strings.xml
index b6b8eac..ae91aad 100644
--- a/packages/SettingsLib/res/values-hi/strings.xml
+++ b/packages/SettingsLib/res/values-hi/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"चार्ज नहीं हो रही है"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"चार्ज नहीं हो रही है"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"पूरी"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"व्यवस्थापक के द्वारा अक्षम किया गया"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-hr/strings.xml b/packages/SettingsLib/res/values-hr/strings.xml
index 69b71fe..5947ef4 100644
--- a/packages/SettingsLib/res/values-hr/strings.xml
+++ b/packages/SettingsLib/res/values-hr/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Ne puni se"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ne puni se"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Puna"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Onemogućio administrator"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-hu/strings.xml b/packages/SettingsLib/res/values-hu/strings.xml
index 26d65fb..00076f0 100644
--- a/packages/SettingsLib/res/values-hu/strings.xml
+++ b/packages/SettingsLib/res/values-hu/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Nem tölt"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nem töltődik"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Feltöltve"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Letiltva a rendszergazda által"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-hy-rAM/strings.xml b/packages/SettingsLib/res/values-hy-rAM/strings.xml
index 0caa981..639e0e6 100644
--- a/packages/SettingsLib/res/values-hy-rAM/strings.xml
+++ b/packages/SettingsLib/res/values-hy-rAM/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Չի լիցքավորվում"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Չի լիցքավորվում"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Լիցքավորված"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Կասեցված է ադմինիստրատորի կողմից"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-in/strings.xml b/packages/SettingsLib/res/values-in/strings.xml
index 7aba923..ded51a4 100644
--- a/packages/SettingsLib/res/values-in/strings.xml
+++ b/packages/SettingsLib/res/values-in/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Tidak mengisi daya"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Tidak mengisi daya"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Penuh"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Dinonaktifkan oleh administrator"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-is-rIS/strings.xml b/packages/SettingsLib/res/values-is-rIS/strings.xml
index a534db6..345ad44 100644
--- a/packages/SettingsLib/res/values-is-rIS/strings.xml
+++ b/packages/SettingsLib/res/values-is-rIS/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Ekki í hleðslu"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ekki í hleðslu"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Fullhlaðin"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Stjórnandi gerði óvirkt"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-it/strings.xml b/packages/SettingsLib/res/values-it/strings.xml
index eedfa33..874ebcc 100644
--- a/packages/SettingsLib/res/values-it/strings.xml
+++ b/packages/SettingsLib/res/values-it/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Non in carica"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Non in carica"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Carica"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Disattivata dall\'amministratore"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-iw/strings.xml b/packages/SettingsLib/res/values-iw/strings.xml
index eb26eaf..0fd0466 100644
--- a/packages/SettingsLib/res/values-iw/strings.xml
+++ b/packages/SettingsLib/res/values-iw/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"לא בטעינה"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"לא טוען"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"מלא"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"הושבת על ידי מנהל המערכת"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-ja/strings.xml b/packages/SettingsLib/res/values-ja/strings.xml
index dfa7456..c881ca1 100644
--- a/packages/SettingsLib/res/values-ja/strings.xml
+++ b/packages/SettingsLib/res/values-ja/strings.xml
@@ -310,4 +310,5 @@
<!-- String.format failed for translation -->
<!-- no translation found for battery_info_status_full (2824614753861462808) -->
<skip />
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"管理者によって無効にされています"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-ka-rGE/strings.xml b/packages/SettingsLib/res/values-ka-rGE/strings.xml
index 0f0428f..f6d713e 100644
--- a/packages/SettingsLib/res/values-ka-rGE/strings.xml
+++ b/packages/SettingsLib/res/values-ka-rGE/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"არ იტენება"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"არ იტენება"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"ბატარეა დატენილია"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"გათიშულია ადმინისტრატორის მიერ"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-kk-rKZ/strings.xml b/packages/SettingsLib/res/values-kk-rKZ/strings.xml
index 2f2ffbc..c839a0b 100644
--- a/packages/SettingsLib/res/values-kk-rKZ/strings.xml
+++ b/packages/SettingsLib/res/values-kk-rKZ/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Зарядталу орындалып жатқан жоқ"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Зарядталып тұрған жоқ"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Толық"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Әкімші өшірген"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-km-rKH/strings.xml b/packages/SettingsLib/res/values-km-rKH/strings.xml
index 6feb93d..4aa4d0d 100644
--- a/packages/SettingsLib/res/values-km-rKH/strings.xml
+++ b/packages/SettingsLib/res/values-km-rKH/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"មិនកំពុងបញ្ចូលថ្ម"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"មិនបញ្ចូលថ្ម"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"ពេញ"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"បានបិទដំណើរការដោយអ្នកគ្រប់គ្រង"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-kn-rIN/strings.xml b/packages/SettingsLib/res/values-kn-rIN/strings.xml
index 948c665315..ee4b254 100644
--- a/packages/SettingsLib/res/values-kn-rIN/strings.xml
+++ b/packages/SettingsLib/res/values-kn-rIN/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"ಚಾರ್ಜ್ ಆಗುತ್ತಿಲ್ಲ"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"ಚಾರ್ಜ್ ಆಗುತ್ತಿಲ್ಲ"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"ಭರ್ತಿ"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"ನಿರ್ವಾಹಕರಿಂದ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-ko/strings.xml b/packages/SettingsLib/res/values-ko/strings.xml
index ae82263..51a8a6f 100644
--- a/packages/SettingsLib/res/values-ko/strings.xml
+++ b/packages/SettingsLib/res/values-ko/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"충전 안함"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"충전 안함"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"충전 완료"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"관리자가 사용 중지함"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-ky-rKG/strings.xml b/packages/SettingsLib/res/values-ky-rKG/strings.xml
index fcd7b8f..66a83ca 100644
--- a/packages/SettingsLib/res/values-ky-rKG/strings.xml
+++ b/packages/SettingsLib/res/values-ky-rKG/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Кубат алган жок"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Кубатталган жок"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Толук"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Администратор өчүрүп койгон"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-lo-rLA/strings.xml b/packages/SettingsLib/res/values-lo-rLA/strings.xml
index c29b9ab..ed7b61a 100644
--- a/packages/SettingsLib/res/values-lo-rLA/strings.xml
+++ b/packages/SettingsLib/res/values-lo-rLA/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"ບໍ່ໄດ້ສາກໄຟ"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"ບໍ່ໄດ້ສາກໄຟ"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"ເຕັມ"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"ຖືກປິດໃຊ້ໂດຍຜູ້ເບິ່ງແຍງລະບົບ"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-lt/strings.xml b/packages/SettingsLib/res/values-lt/strings.xml
index a75c24e..0790304 100644
--- a/packages/SettingsLib/res/values-lt/strings.xml
+++ b/packages/SettingsLib/res/values-lt/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Nekraunama"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nekraunama"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Visiškai įkrautas"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Išjungė administratorius"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-lv/strings.xml b/packages/SettingsLib/res/values-lv/strings.xml
index 23aa537..0333d58 100644
--- a/packages/SettingsLib/res/values-lv/strings.xml
+++ b/packages/SettingsLib/res/values-lv/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Nenotiek uzlāde"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nenotiek uzlāde"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Pilns"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Atspējojis administrators"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-mk-rMK/strings.xml b/packages/SettingsLib/res/values-mk-rMK/strings.xml
index 32d276e..5a01bb7 100644
--- a/packages/SettingsLib/res/values-mk-rMK/strings.xml
+++ b/packages/SettingsLib/res/values-mk-rMK/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Не се полни"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не се полни"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Целосна"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Оневозможено од администраторот"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-ml-rIN/strings.xml b/packages/SettingsLib/res/values-ml-rIN/strings.xml
index 9684b7b..ac14b99 100644
--- a/packages/SettingsLib/res/values-ml-rIN/strings.xml
+++ b/packages/SettingsLib/res/values-ml-rIN/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"ചാർജ്ജുചെയ്യുന്നില്ല"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"ചാർജ്ജുചെയ്യുന്നില്ല"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"നിറഞ്ഞു"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"അഡ്മിനിസ്ട്രേറ്റർ പ്രവർത്തനരഹിതമാക്കി"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-mn-rMN/strings.xml b/packages/SettingsLib/res/values-mn-rMN/strings.xml
index a3f9dfa..be9f520 100644
--- a/packages/SettingsLib/res/values-mn-rMN/strings.xml
+++ b/packages/SettingsLib/res/values-mn-rMN/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Цэнэглэхгүй байна"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Цэнэглэхгүй байна"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Дүүрэн"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Админ идэвхгүй болгосон"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-mr-rIN/strings.xml b/packages/SettingsLib/res/values-mr-rIN/strings.xml
index 804fab0..717543e 100644
--- a/packages/SettingsLib/res/values-mr-rIN/strings.xml
+++ b/packages/SettingsLib/res/values-mr-rIN/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"चार्ज होत नाही"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"चार्ज होत नाही"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"पूर्ण"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"प्रशासकाद्वारे अक्षम केलेले"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-ms-rMY/strings.xml b/packages/SettingsLib/res/values-ms-rMY/strings.xml
index 7020409..0206558 100644
--- a/packages/SettingsLib/res/values-ms-rMY/strings.xml
+++ b/packages/SettingsLib/res/values-ms-rMY/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Tidak mengecas"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Tidak mengecas"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Penuh"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Dilumpuhkan oleh pentadbir"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-my-rMM/strings.xml b/packages/SettingsLib/res/values-my-rMM/strings.xml
index e40da23..6153694 100644
--- a/packages/SettingsLib/res/values-my-rMM/strings.xml
+++ b/packages/SettingsLib/res/values-my-rMM/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"အားသွင်းမနေပါ"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"အားသွင်းမနေပါ"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"အပြည့်"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"စီမံခန့်ခွဲသူမှ ပိတ်ထားသည်"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-nb/strings.xml b/packages/SettingsLib/res/values-nb/strings.xml
index e39cf30..0532dd4 100644
--- a/packages/SettingsLib/res/values-nb/strings.xml
+++ b/packages/SettingsLib/res/values-nb/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Lader ikke"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Lader ikke"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Fullt"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Avslått av administratoren"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-ne-rNP/strings.xml b/packages/SettingsLib/res/values-ne-rNP/strings.xml
index b8beecf..48cefce 100644
--- a/packages/SettingsLib/res/values-ne-rNP/strings.xml
+++ b/packages/SettingsLib/res/values-ne-rNP/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"चार्ज भइरहेको छैन"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"चार्ज हुँदै छैन"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"पूर्ण"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"प्रशासकद्वारा असक्षम गरिएको"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-nl/strings.xml b/packages/SettingsLib/res/values-nl/strings.xml
index 4873ac3..a0fb3100 100644
--- a/packages/SettingsLib/res/values-nl/strings.xml
+++ b/packages/SettingsLib/res/values-nl/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Wordt niet opgeladen"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Wordt niet opgeladen"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Volledig"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Uitgeschakeld door beheerder"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-pa-rIN/strings.xml b/packages/SettingsLib/res/values-pa-rIN/strings.xml
index 61f187d..8715438 100644
--- a/packages/SettingsLib/res/values-pa-rIN/strings.xml
+++ b/packages/SettingsLib/res/values-pa-rIN/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"ਚਾਰਜ ਨਹੀਂ ਹੋ ਰਿਹਾ"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"ਚਾਰਜ ਨਹੀਂ ਹੋ ਰਿਹਾ"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"ਪੂਰੀ"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-pl/strings.xml b/packages/SettingsLib/res/values-pl/strings.xml
index 9e0abfa..786860f 100644
--- a/packages/SettingsLib/res/values-pl/strings.xml
+++ b/packages/SettingsLib/res/values-pl/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Nie podłączony"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nie podłączony"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Naładowana"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Wyłączone przez administratora"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-pt-rBR/strings.xml b/packages/SettingsLib/res/values-pt-rBR/strings.xml
index db6b326..e88ce8e 100644
--- a/packages/SettingsLib/res/values-pt-rBR/strings.xml
+++ b/packages/SettingsLib/res/values-pt-rBR/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Não está carregando"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Não está carregando"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Cheio"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Desativada pelo administrador"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-pt-rPT/strings.xml b/packages/SettingsLib/res/values-pt-rPT/strings.xml
index 2f25ae2..1124b3d 100644
--- a/packages/SettingsLib/res/values-pt-rPT/strings.xml
+++ b/packages/SettingsLib/res/values-pt-rPT/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Não está a carregar"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Não está a carregar"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Completo"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Desativado pelo administrador"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-pt/strings.xml b/packages/SettingsLib/res/values-pt/strings.xml
index db6b326..e88ce8e 100644
--- a/packages/SettingsLib/res/values-pt/strings.xml
+++ b/packages/SettingsLib/res/values-pt/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Não está carregando"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Não está carregando"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Cheio"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Desativada pelo administrador"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-ro/strings.xml b/packages/SettingsLib/res/values-ro/strings.xml
index e6a45a7..04cba99 100644
--- a/packages/SettingsLib/res/values-ro/strings.xml
+++ b/packages/SettingsLib/res/values-ro/strings.xml
@@ -181,7 +181,7 @@
<string name="adb_warning_title" msgid="6234463310896563253">"Permiteți depanarea USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Depanarea USB are exclusiv scopuri de dezvoltare. Utilizați-o pentru a copia date de pe computer pe dispozitiv, pentru a instala aplicații pe dispozitiv fără notificare și pentru a citi datele din jurnale."</string>
<string name="adb_keys_warning_message" msgid="5659849457135841625">"Revocați accesul la remedierea erorilor prin USB de pe toate computerele pe care le-ați autorizat anterior?"</string>
- <string name="dev_settings_warning_title" msgid="7244607768088540165">"Permiteţi setările pentru dezvoltare?"</string>
+ <string name="dev_settings_warning_title" msgid="7244607768088540165">"Permiteți setările pentru dezvoltare?"</string>
<string name="dev_settings_warning_message" msgid="2298337781139097964">"Aceste setări sunt destinate exclusiv utilizării pentru dezvoltare. Din cauza lor, este posibil ca dispozitivul dvs. și aplicațiile de pe acesta să nu mai funcţioneze sau să funcţioneze necorespunzător."</string>
<string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verificați aplicațiile prin USB"</string>
<string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Verificaţi aplicațiile instalate utilizând ADB/ADT, pentru a detecta un comportament dăunător."</string>
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Nu se încarcă"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nu încarcă"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Complet"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Dezactivată de administrator"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-ru/strings.xml b/packages/SettingsLib/res/values-ru/strings.xml
index 2bb3fdb3..9f08ca7 100644
--- a/packages/SettingsLib/res/values-ru/strings.xml
+++ b/packages/SettingsLib/res/values-ru/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Не заряжается"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не заряжается"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Батарея заряжена"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Отключено администратором"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-si-rLK/strings.xml b/packages/SettingsLib/res/values-si-rLK/strings.xml
index bd9426c..19fa2be 100644
--- a/packages/SettingsLib/res/values-si-rLK/strings.xml
+++ b/packages/SettingsLib/res/values-si-rLK/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"ආරෝපණය නොවේ"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"ආරෝපණය නොවෙමින්"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"පූර්ණ"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"පරිපාලක විසින් අබල කරන ලදී"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-sk/strings.xml b/packages/SettingsLib/res/values-sk/strings.xml
index 8df02ea..ee83b81 100644
--- a/packages/SettingsLib/res/values-sk/strings.xml
+++ b/packages/SettingsLib/res/values-sk/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Nenabíja sa"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nenabíja sa"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Nabitá"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Zakázané správcom"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-sl/strings.xml b/packages/SettingsLib/res/values-sl/strings.xml
index 57495e6..02a6f73 100644
--- a/packages/SettingsLib/res/values-sl/strings.xml
+++ b/packages/SettingsLib/res/values-sl/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Se ne polni"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Se ne polni"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Poln"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Onemogočil skrbnik"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-sq-rAL/strings.xml b/packages/SettingsLib/res/values-sq-rAL/strings.xml
index 1835b39..3704ee5 100644
--- a/packages/SettingsLib/res/values-sq-rAL/strings.xml
+++ b/packages/SettingsLib/res/values-sq-rAL/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Nuk po ngarkohet"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nuk po ngarkohet"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"E mbushur"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Çaktivizuar nga administratori"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-sr/strings.xml b/packages/SettingsLib/res/values-sr/strings.xml
index c39682a..bc04d26 100644
--- a/packages/SettingsLib/res/values-sr/strings.xml
+++ b/packages/SettingsLib/res/values-sr/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Не пуни се"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не пуни се"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Пуно"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Онемогућио је администратор"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-sv/strings.xml b/packages/SettingsLib/res/values-sv/strings.xml
index 1bdf6b2..1fb9acbd 100644
--- a/packages/SettingsLib/res/values-sv/strings.xml
+++ b/packages/SettingsLib/res/values-sv/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Laddar inte"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Laddar inte"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Fullt"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Har inaktiverats av administratören"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-sw/strings.xml b/packages/SettingsLib/res/values-sw/strings.xml
index 9cf0db7..c8cce1f 100644
--- a/packages/SettingsLib/res/values-sw/strings.xml
+++ b/packages/SettingsLib/res/values-sw/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Haichaji"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Haichaji"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Imejaa"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Msimamizi amezima mapendeleo ya mipangilio"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-ta-rIN/strings.xml b/packages/SettingsLib/res/values-ta-rIN/strings.xml
index c21db5b..aded7da 100644
--- a/packages/SettingsLib/res/values-ta-rIN/strings.xml
+++ b/packages/SettingsLib/res/values-ta-rIN/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"சார்ஜ் செய்யப்படவில்லை"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"சார்ஜ் ஏறவில்லை"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"முழுமை"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"நிர்வாகி முடக்கியுள்ளார்"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-te-rIN/strings.xml b/packages/SettingsLib/res/values-te-rIN/strings.xml
index 04f0ca0..0acd8d5 100644
--- a/packages/SettingsLib/res/values-te-rIN/strings.xml
+++ b/packages/SettingsLib/res/values-te-rIN/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"ఛార్జ్ కావడం లేదు"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"ఛార్జ్ కావడం లేదు"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"నిండింది"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"నిర్వాహకుడు నిలిపివేసారు"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-th/strings.xml b/packages/SettingsLib/res/values-th/strings.xml
index acde81e..316472c 100644
--- a/packages/SettingsLib/res/values-th/strings.xml
+++ b/packages/SettingsLib/res/values-th/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"ไม่ได้ชาร์จ"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"ไม่ได้ชาร์จ"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"เต็ม"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"ปิดใช้โดยผู้ดูแลระบบ"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-tl/strings.xml b/packages/SettingsLib/res/values-tl/strings.xml
index 7e856e85..452afa6 100644
--- a/packages/SettingsLib/res/values-tl/strings.xml
+++ b/packages/SettingsLib/res/values-tl/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Hindi nagcha-charge"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Hindi nagkakarga"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Puno"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Na-disable ng administrator"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-tr/strings.xml b/packages/SettingsLib/res/values-tr/strings.xml
index 8577f7d..0e4445c 100644
--- a/packages/SettingsLib/res/values-tr/strings.xml
+++ b/packages/SettingsLib/res/values-tr/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Şarj olmuyor"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Şarj etmiyor"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Dolu"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Yönetici tarafından devre dışı bırakıldı"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-uk/strings.xml b/packages/SettingsLib/res/values-uk/strings.xml
index 3e89cce..a0ffb2b 100644
--- a/packages/SettingsLib/res/values-uk/strings.xml
+++ b/packages/SettingsLib/res/values-uk/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Не заряджається"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не заряджається"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Акумулятор заряджено"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Вимкнено адміністратором"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-ur-rPK/strings.xml b/packages/SettingsLib/res/values-ur-rPK/strings.xml
index a565ab7..e3e0a9e 100644
--- a/packages/SettingsLib/res/values-ur-rPK/strings.xml
+++ b/packages/SettingsLib/res/values-ur-rPK/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"چارج نہیں ہو رہا ہے"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"چارج نہیں ہو رہا ہے"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"مکمل"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"منتظم نے غیر فعال کر دیا"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-uz-rUZ/strings.xml b/packages/SettingsLib/res/values-uz-rUZ/strings.xml
index 246287a..182c84c 100644
--- a/packages/SettingsLib/res/values-uz-rUZ/strings.xml
+++ b/packages/SettingsLib/res/values-uz-rUZ/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Quvvatlantirilmayapti"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Quvvatlanmayapti"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"To‘la"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Administrator tomonidan o‘chirib qo‘yilgan"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-vi/strings.xml b/packages/SettingsLib/res/values-vi/strings.xml
index f07c8a0..57e2573 100644
--- a/packages/SettingsLib/res/values-vi/strings.xml
+++ b/packages/SettingsLib/res/values-vi/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Hiện không sạc"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Hiện không sạc"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Đầy"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Bị tắt bởi quản trị viên"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-zh-rCN/strings.xml b/packages/SettingsLib/res/values-zh-rCN/strings.xml
index 5c4f733..20c7874 100644
--- a/packages/SettingsLib/res/values-zh-rCN/strings.xml
+++ b/packages/SettingsLib/res/values-zh-rCN/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"未在充电"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"未在充电"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"电量充足"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"已被管理员禁用"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-zh-rHK/strings.xml b/packages/SettingsLib/res/values-zh-rHK/strings.xml
index 952b198..583db26 100644
--- a/packages/SettingsLib/res/values-zh-rHK/strings.xml
+++ b/packages/SettingsLib/res/values-zh-rHK/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"非充電中"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"未開始充電"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"電量已滿"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"管理員已停用此設定"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-zh-rTW/strings.xml b/packages/SettingsLib/res/values-zh-rTW/strings.xml
index f66f093..3bb2176 100644
--- a/packages/SettingsLib/res/values-zh-rTW/strings.xml
+++ b/packages/SettingsLib/res/values-zh-rTW/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"非充電中"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"非充電中"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"電力充足"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"已由管理員停用"</string>
</resources>
diff --git a/packages/SettingsLib/res/values-zu/strings.xml b/packages/SettingsLib/res/values-zu/strings.xml
index f42abbc..ca9d867 100644
--- a/packages/SettingsLib/res/values-zu/strings.xml
+++ b/packages/SettingsLib/res/values-zu/strings.xml
@@ -308,4 +308,5 @@
<string name="battery_info_status_discharging" msgid="310932812698268588">"Ayishaji"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ayishaji"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Kugcwele"</string>
+ <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Ikhutshazwe umlawuli"</string>
</resources>
diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java
index d3c1364..85cc3e4 100644
--- a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java
@@ -21,6 +21,7 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageManager;
import android.content.pm.UserInfo;
import android.graphics.Color;
@@ -125,7 +126,7 @@
* {@link UserHandle#USER_NULL}.
*/
public static EnforcedAdmin checkIfKeyguardFeaturesDisabled(Context context,
- int keyguardFeatures) {
+ int keyguardFeatures, int userId) {
final DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
Context.DEVICE_POLICY_SERVICE);
if (dpm == null) {
@@ -134,7 +135,6 @@
final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
EnforcedAdmin enforcedAdmin = null;
- final int userId = UserHandle.myUserId();
if (um.getUserInfo(userId).isManagedProfile()) {
final List<ComponentName> admins = dpm.getActiveAdminsAsUser(userId);
if (admins == null) {
@@ -178,7 +178,7 @@
if (userInfo.isManagedProfile()) {
// If userInfo.id is a managed profile, we also need to look at
// the policies set on the parent.
- DevicePolicyManager parentDpm = dpm.getParentProfileInstance(admin);
+ DevicePolicyManager parentDpm = dpm.getParentProfileInstance(userInfo);
if ((parentDpm.getKeyguardDisabledFeatures(admin, userInfo.id)
& keyguardFeatures) != 0) {
if (enforcedAdmin == null) {
@@ -227,6 +227,26 @@
}
/**
+ * Check if an application is suspended.
+ *
+ * @return EnforcedAdmin Object containing the enforced admin component and admin user details,
+ * or {@code null} if the application is not suspended.
+ */
+ public static EnforcedAdmin checkIfApplicationIsSuspended(Context context, String packageName,
+ int userId) {
+ IPackageManager ipm = AppGlobals.getPackageManager();
+ try {
+ ApplicationInfo ai = ipm.getApplicationInfo(packageName, 0, userId);
+ if (ai != null && ((ai.flags & ApplicationInfo.FLAG_SUSPENDED) != 0)) {
+ return getProfileOrDeviceOwnerOnCallingUser(context);
+ }
+ } catch (RemoteException e) {
+ // Nothing to do
+ }
+ return null;
+ }
+
+ /**
* Check if account management for a specific type of account is disabled by admin.
* Only a profile or device owner can disable account management. So, we check if account
* management is disabled and return profile or device owner on the calling user.
@@ -375,7 +395,7 @@
if (userInfo.isManagedProfile()) {
// If userInfo.id is a managed profile, we also need to look at
// the policies set on the parent.
- DevicePolicyManager parentDpm = dpm.getParentProfileInstance(admin);
+ DevicePolicyManager parentDpm = dpm.getParentProfileInstance(userInfo);
if (parentDpm.getMaximumTimeToLock(admin, userInfo.id) > 0) {
if (enforcedAdmin == null) {
enforcedAdmin = new EnforcedAdmin(admin, userInfo.id);
diff --git a/packages/SettingsLib/src/com/android/settingslib/users/AppRestrictionsHelper.java b/packages/SettingsLib/src/com/android/settingslib/users/AppRestrictionsHelper.java
index f1beb10..5c8849d 100644
--- a/packages/SettingsLib/src/com/android/settingslib/users/AppRestrictionsHelper.java
+++ b/packages/SettingsLib/src/com/android/settingslib/users/AppRestrictionsHelper.java
@@ -29,7 +29,6 @@
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.os.RemoteException;
-import android.os.ServiceManager;
import android.os.UserHandle;
import android.os.UserManager;
import android.text.TextUtils;
@@ -56,6 +55,7 @@
private final UserManager mUserManager;
private final UserHandle mUser;
private final boolean mRestrictedProfile;
+ private boolean mLeanback;
HashMap<String,Boolean> mSelectedPackages = new HashMap<>();
private List<SelectableAppInfo> mVisibleApps;
@@ -77,6 +77,10 @@
return mSelectedPackages.get(packageName);
}
+ public void setLeanback(boolean isLeanback) {
+ mLeanback = isLeanback;
+ }
+
public List<SelectableAppInfo> getVisibleApps() {
return mVisibleApps;
}
@@ -155,7 +159,11 @@
// Add launchers
Intent launcherIntent = new Intent(Intent.ACTION_MAIN);
- launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+ if (mLeanback) {
+ launcherIntent.addCategory(Intent.CATEGORY_LEANBACK_LAUNCHER);
+ } else {
+ launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+ }
addSystemApps(mVisibleApps, launcherIntent, excludePackages);
// Add widgets
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
index 2ee4b12..5b8ed28 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
@@ -37,6 +37,7 @@
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserHandle;
+import android.support.annotation.NonNull;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;
@@ -104,7 +105,8 @@
private static final int PSK_WPA2 = 2;
private static final int PSK_WPA_WPA2 = 3;
- private static final int VISIBILITY_OUTDATED_AGE_IN_MILLI = 20000;
+ public static final int SIGNAL_LEVELS = 4;
+
private final Context mContext;
private String ssid;
@@ -167,7 +169,7 @@
}
@Override
- public int compareTo(AccessPoint other) {
+ public int compareTo(@NonNull AccessPoint other) {
// Active one goes first.
if (isActive() && !other.isActive()) return -1;
if (!isActive() && other.isActive()) return 1;
@@ -182,8 +184,9 @@
if (networkId == WifiConfiguration.INVALID_NETWORK_ID
&& other.networkId != WifiConfiguration.INVALID_NETWORK_ID) return 1;
- // Sort by signal strength.
- int difference = WifiManager.compareSignalLevel(other.mRssi, mRssi);
+ // Sort by signal strength, bucketed by level
+ int difference = WifiManager.calculateSignalLevel(other.mRssi, SIGNAL_LEVELS)
+ - WifiManager.calculateSignalLevel(mRssi, SIGNAL_LEVELS);
if (difference != 0) {
return difference;
}
@@ -260,7 +263,7 @@
if (mRssi == Integer.MAX_VALUE) {
return -1;
}
- return WifiManager.calculateSignalLevel(mRssi, 4);
+ return WifiManager.calculateSignalLevel(mRssi, SIGNAL_LEVELS);
}
public int getRssi() {
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/NetworkPolicySerializer.java b/packages/SettingsProvider/src/com/android/providers/settings/NetworkPolicySerializer.java
deleted file mode 100644
index 4b87da4..0000000
--- a/packages/SettingsProvider/src/com/android/providers/settings/NetworkPolicySerializer.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package com.android.providers.settings;
-
-import android.net.NetworkPolicy;
-import android.net.NetworkTemplate;
-import android.util.Log;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-/**
- * Backup/Restore Serializer Class for android.net.NetworkPolicy
- */
-public class NetworkPolicySerializer {
- private static final boolean DEBUG = false;
- private static final String TAG = "NetworkPolicySerializer";
-
- private static final int NULL = 0;
- private static final int NOT_NULL = 1;
- /**
- * Current Version of the Serializer.
- */
- private static int STATE_VERSION = 1;
-
- /**
- * Marshals an array of NetworkPolicy objects into a byte-array.
- *
- * @param policies - NetworkPolicies to be Marshaled
- * @return byte array
- */
-
- public static byte[] marshalNetworkPolicies(NetworkPolicy policies[]) {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- if (policies != null && policies.length != 0) {
- DataOutputStream out = new DataOutputStream(baos);
- try {
- out.writeInt(STATE_VERSION);
- out.writeInt(policies.length);
- for (NetworkPolicy policy : policies) {
- byte[] marshaledPolicy = marshalNetworkPolicy(policy);
- if (marshaledPolicy != null) {
- out.writeByte(NOT_NULL);
- out.writeInt(marshaledPolicy.length);
- out.write(marshaledPolicy);
- } else {
- out.writeByte(NULL);
- }
- }
- } catch (IOException ioe) {
- Log.e(TAG, "Failed to Convert NetworkPolicies to byte array", ioe);
- baos.reset();
- }
- }
- return baos.toByteArray();
- }
-
- /**
- * Unmarshals a byte array into an array of NetworkPolicy Objects
- *
- * @param data - marshaled NetworkPolicies Array
- * @return NetworkPolicy[] array
- */
- public static NetworkPolicy[] unmarshalNetworkPolicies(byte[] data) {
- if (data == null || data.length == 0) {
- return new NetworkPolicy[0];
- }
- DataInputStream in = new DataInputStream(new ByteArrayInputStream(data));
- try {
- int version = in.readInt();
- int length = in.readInt();
- NetworkPolicy[] policies = new NetworkPolicy[length];
- for (int i = 0; i < length; i++) {
- byte isNull = in.readByte();
- if (isNull == NULL) continue;
- int byteLength = in.readInt();
- byte[] policyData = new byte[byteLength];
- in.read(policyData, 0, byteLength);
- policies[i] = unmarshalNetworkPolicy(policyData);
- }
- return policies;
- } catch (IOException ioe) {
- Log.e(TAG, "Failed to Convert byte array to NetworkPolicies", ioe);
- return new NetworkPolicy[0];
- }
- }
-
- /**
- * Marshals a NetworkPolicy object into a byte-array.
- *
- * @param networkPolicy - NetworkPolicy to be Marshaled
- * @return byte array
- */
- public static byte[] marshalNetworkPolicy(NetworkPolicy networkPolicy) {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- if (networkPolicy != null) {
- DataOutputStream out = new DataOutputStream(baos);
- try {
- out.writeInt(STATE_VERSION);
- writeNetworkTemplate(out, networkPolicy.template);
- out.writeInt(networkPolicy.cycleDay);
- writeString(out, networkPolicy.cycleTimezone);
- out.writeLong(networkPolicy.warningBytes);
- out.writeLong(networkPolicy.limitBytes);
- out.writeLong(networkPolicy.lastWarningSnooze);
- out.writeLong(networkPolicy.lastLimitSnooze);
- out.writeInt(networkPolicy.metered ? 1 : 0);
- out.writeInt(networkPolicy.inferred ? 1 : 0);
- } catch (IOException ioe) {
- Log.e(TAG, "Failed to Convert NetworkPolicy to byte array", ioe);
- baos.reset();
- }
- }
- return baos.toByteArray();
- }
-
- /**
- * Unmarshals a byte array into a NetworkPolicy Object
- *
- * @param data - marshaled NetworkPolicy Object
- * @return NetworkPolicy Object
- */
- public static NetworkPolicy unmarshalNetworkPolicy(byte[] data) {
- if (data == null || data.length == 0) {
- return null;
- }
- DataInputStream in = new DataInputStream(new ByteArrayInputStream(data));
- try {
- int version = in.readInt();
- NetworkTemplate template = readNetworkTemplate(in, version);
- int cycleDay = in.readInt();
- String cycleTimeZone = readString(in, version);
- long warningBytes = in.readLong();
- long limitBytes = in.readLong();
- long lastWarningSnooze = in.readLong();
- long lastLimitSnooze = in.readLong();
- boolean metered = in.readInt() == 1;
- boolean inferred = in.readInt() == 1;
- return new NetworkPolicy(template, cycleDay, cycleTimeZone, warningBytes, limitBytes,
- lastWarningSnooze, lastLimitSnooze, metered, inferred);
- } catch (IOException ioe) {
- Log.e(TAG, "Failed to Convert byte array to NetworkPolicy", ioe);
- return null;
- }
- }
-
- private static NetworkTemplate readNetworkTemplate(DataInputStream in, int version)
- throws IOException {
- byte isNull = in.readByte();
- if (isNull == NULL) return null;
- int matchRule = in.readInt();
- String subscriberId = readString(in, version);
- String networkId = readString(in, version);
- return new NetworkTemplate(matchRule, subscriberId, networkId);
- }
-
- private static void writeNetworkTemplate(DataOutputStream out, NetworkTemplate template)
- throws IOException {
- if (template != null) {
- out.writeByte(NOT_NULL);
- out.writeInt(template.getMatchRule());
- writeString(out, template.getSubscriberId());
- writeString(out, template.getNetworkId());
- } else {
- out.writeByte(NULL);
- }
- }
-
- private static String readString(DataInputStream in, int version) throws IOException {
- byte isNull = in.readByte();
- if (isNull == NOT_NULL) {
- return in.readUTF();
- }
- return null;
- }
-
- private static void writeString(DataOutputStream out, String val) throws IOException {
- if (val != null) {
- out.writeByte(NOT_NULL);
- out.writeUTF(val);
- } else {
- out.writeByte(NULL);
- }
- }
-}
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
index 185a03f..8910af4 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
@@ -24,7 +24,6 @@
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
-import android.net.NetworkPolicyManager;
import android.net.Uri;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiConfiguration.KeyMgmt;
@@ -83,12 +82,10 @@
private static final String KEY_LOCALE = "locale";
private static final String KEY_LOCK_SETTINGS = "lock_settings";
private static final String KEY_SOFTAP_CONFIG = "softap_config";
- private static final String KEY_NET_POLICIES = "network_policies";
-
// Versioning of the state file. Increment this version
// number any time the set of state items is altered.
- private static final int STATE_VERSION = 6;
+ private static final int STATE_VERSION = 5;
// Slots in the checksum array. Never insert new items in the middle
// of this array; new slots must be appended.
@@ -100,9 +97,8 @@
private static final int STATE_GLOBAL = 5;
private static final int STATE_LOCK_SETTINGS = 6;
private static final int STATE_SOFTAP_CONFIG = 7;
- private static final int STATE_NET_POLICIES = 8;
- private static final int STATE_SIZE = 9; // The current number of state items
+ private static final int STATE_SIZE = 8; // The current number of state items
// Number of entries in the checksum array at various version numbers
private static final int STATE_SIZES[] = {
@@ -111,8 +107,7 @@
5, // version 2 added STATE_WIFI_CONFIG
6, // version 3 added STATE_GLOBAL
7, // version 4 added STATE_LOCK_SETTINGS
- 8, // version 5 added STATE_SOFTAP_CONFIG
- STATE_SIZE // version 6 added STATE_NET_POLICIES
+ STATE_SIZE // version 5 added STATE_SOFTAP_CONFIG
};
// Versioning of the 'full backup' format
@@ -120,7 +115,6 @@
private static final int FULL_BACKUP_ADDED_GLOBAL = 2; // added the "global" entry
private static final int FULL_BACKUP_ADDED_LOCK_SETTINGS = 3; // added the "lock_settings" entry
private static final int FULL_BACKUP_ADDED_SOFTAP_CONF = 4; //added the "softap_config" entry
- private static final int FULL_BACKUP_ADDED_NET_POLICIES = 5; //added the "network_policies" entry
private static final int INTEGER_BYTE_COUNT = Integer.SIZE / Byte.SIZE;
@@ -416,7 +410,6 @@
byte[] wifiSupplicantData = getWifiSupplicant(FILE_WIFI_SUPPLICANT);
byte[] wifiConfigData = getFileData(mWifiConfigFile);
byte[] softApConfigData = getSoftAPConfiguration();
- byte[] netPoliciesData = getNetworkPolicies();
long[] stateChecksums = readOldChecksums(oldState);
@@ -440,9 +433,6 @@
stateChecksums[STATE_SOFTAP_CONFIG] =
writeIfChanged(stateChecksums[STATE_SOFTAP_CONFIG], KEY_SOFTAP_CONFIG,
softApConfigData, data);
- stateChecksums[STATE_NET_POLICIES] =
- writeIfChanged(stateChecksums[STATE_NET_POLICIES], KEY_NET_POLICIES,
- netPoliciesData, data);
writeNewChecksums(stateChecksums, newState);
}
@@ -583,10 +573,6 @@
byte[] softapData = new byte[size];
data.readEntityData(softapData, 0, size);
restoreSoftApConfiguration(softapData);
- } else if (KEY_NET_POLICIES.equals(key)) {
- byte[] netPoliciesData = new byte[size];
- data.readEntityData(netPoliciesData, 0, size);
- restoreNetworkPolicies(netPoliciesData);
} else {
data.skipEntityData();
}
@@ -616,7 +602,6 @@
byte[] wifiSupplicantData = getWifiSupplicant(FILE_WIFI_SUPPLICANT);
byte[] wifiConfigData = getFileData(mWifiConfigFile);
byte[] softApConfigData = getSoftAPConfiguration();
- byte[] netPoliciesData = getNetworkPolicies();
// Write the data to the staging file, then emit that as our tarfile
// representation of the backed-up settings.
@@ -654,9 +639,6 @@
if (DEBUG_BACKUP) Log.d(TAG, softApConfigData.length + " bytes of softap config data");
out.writeInt(softApConfigData.length);
out.write(softApConfigData);
- if (DEBUG_BACKUP) Log.d(TAG, netPoliciesData.length + " bytes of network policies data");
- out.writeInt(netPoliciesData.length);
- out.write(netPoliciesData);
out.flush(); // also flushes downstream
@@ -759,16 +741,6 @@
}
}
- if (version >= FULL_BACKUP_ADDED_NET_POLICIES){
- nBytes = in.readInt();
- if (DEBUG_BACKUP) Log.d(TAG, nBytes + " bytes of network policies data");
- if (nBytes > buffer.length) buffer = new byte[nBytes];
- if (nBytes > 0) {
- in.readFully(buffer, 0, nBytes);
- restoreNetworkPolicies(buffer);
- }
- }
-
if (DEBUG_BACKUP) Log.d(TAG, "Full restore complete.");
} else {
data.close();
@@ -1224,20 +1196,6 @@
wifiManager.setWifiApConfiguration(WiFiConfigurationSerializer.unmarshalWifiConfig(data));
}
- private byte[] getNetworkPolicies(){
- NetworkPolicyManager networkPolicyManager =
- (NetworkPolicyManager)getSystemService(NETWORK_POLICY_SERVICE);
- return NetworkPolicySerializer
- .marshalNetworkPolicies(networkPolicyManager.getNetworkPolicies());
- }
-
- private void restoreNetworkPolicies(byte[] data){
- NetworkPolicyManager networkPolicyManager =
- (NetworkPolicyManager)getSystemService(NETWORK_POLICY_SERVICE);
- networkPolicyManager
- .setNetworkPolicies(NetworkPolicySerializer.unmarshalNetworkPolicies(data));
- }
-
/**
* Write an int in BigEndian into the byte array.
* @param out byte array
@@ -1259,10 +1217,11 @@
}
private int readInt(byte[] in, int pos) {
- int result = ((in[pos ] & 0xFF) << 24) |
- ((in[pos + 1] & 0xFF) << 16) |
- ((in[pos + 2] & 0xFF) << 8) |
- ((in[pos + 3] & 0xFF) << 0);
+ int result =
+ ((in[pos ] & 0xFF) << 24) |
+ ((in[pos + 1] & 0xFF) << 16) |
+ ((in[pos + 2] & 0xFF) << 8) |
+ ((in[pos + 3] & 0xFF) << 0);
return result;
}
@@ -1279,4 +1238,4 @@
}
return WifiManager.WIFI_STATE_UNKNOWN;
}
-}
+}
\ No newline at end of file
diff --git a/packages/SettingsProvider/test/Android.mk b/packages/SettingsProvider/test/Android.mk
index f278967..ef863e7 100644
--- a/packages/SettingsProvider/test/Android.mk
+++ b/packages/SettingsProvider/test/Android.mk
@@ -5,10 +5,7 @@
# Note we statically link SettingsState to do some unit tests. It's not accessible otherwise
# because this test is not an instrumentation test. (because the target runs in the system process.)
LOCAL_SRC_FILES := $(call all-subdir-java-files) \
- ../src/com/android/providers/settings/SettingsState.java \
- ../src/com/android/providers/settings/WiFiConfigurationSerializer.java \
- ../src/com/android/providers/settings/NetworkPolicySerializer.java
-
+ ../src/com/android/providers/settings/SettingsState.java
LOCAL_PACKAGE_NAME := SettingsProviderTest
@@ -16,4 +13,4 @@
LOCAL_CERTIFICATE := platform
-include $(BUILD_PACKAGE)
+include $(BUILD_PACKAGE)
\ No newline at end of file
diff --git a/packages/SettingsProvider/test/src/com/android/providers/settings/NetworkPolicySerializerTest.java b/packages/SettingsProvider/test/src/com/android/providers/settings/NetworkPolicySerializerTest.java
deleted file mode 100644
index 1986596..0000000
--- a/packages/SettingsProvider/test/src/com/android/providers/settings/NetworkPolicySerializerTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.android.providers.settings;
-
-import android.net.NetworkPolicy;
-import android.net.NetworkTemplate;
-import android.test.AndroidTestCase;
-
-import java.util.Random;
-
-/**
- * Tests for NetworkPolicySerializer
- */
-public class NetworkPolicySerializerTest extends AndroidTestCase {
- static Random sRandom = new Random();
-
- public void testMarshallAndUnmarshalNetworkPolicy() {
- NetworkPolicy policy = getDummyNetworkPolicy();
- byte[] data = NetworkPolicySerializer.marshalNetworkPolicy(policy);
- assertNotNull("Got Null data from marshal", data);
- assertFalse("Got back an empty byte[] from marshal", data.length == 0);
-
- NetworkPolicy unmarshaled = NetworkPolicySerializer.unmarshalNetworkPolicy(data);
- assertNotNull("Got Null data from unmarshaled", unmarshaled);
- assertTrue("NetworkPolicy Marshall and Unmarshal Failed!", policy.equals(unmarshaled));
- }
-
- public void testMarshallNetworkPolicyEdgeCases() {
- byte[] data = NetworkPolicySerializer.marshalNetworkPolicy(null);
- assertNotNull("NetworkPolicy marshal returned null. Expected: byte[0]", data);
- assertEquals("NetworkPolicy marshal returned incomplete byte array. Expected: byte[0]",
- data.length, 0);
- }
-
- public void testUnmarshallNetworkPolicyEdgeCases() {
- NetworkPolicy policy = NetworkPolicySerializer.unmarshalNetworkPolicy(null);
- assertNull("Non null NetworkPolicy returned for null byte[] input", policy);
-
- policy = NetworkPolicySerializer.unmarshalNetworkPolicy(new byte[0]);
- assertNull("Non null NetworkPolicy returned for empty byte[] input", policy);
-
- policy = NetworkPolicySerializer.unmarshalNetworkPolicy(new byte[]{10, 20, 30, 40, 50, 60});
- assertNull("Non null NetworkPolicy returned for incomplete byte[] input", policy);
- }
-
- public void testMarshallAndUnmarshalNetworkPolicies() {
- NetworkPolicy[] policies = getDummyNetworkPolicies(5);
- byte[] data = NetworkPolicySerializer.marshalNetworkPolicies(policies);
- assertNotNull("Got Null data from marshal", data);
- assertFalse("Got back an empty byte[] from marshal", data.length == 0);
-
- NetworkPolicy[] unmarshaled = NetworkPolicySerializer.unmarshalNetworkPolicies(data);
- assertNotNull("Got Null data from unmarshaled", unmarshaled);
- try {
- for (int i = 0; i < policies.length; i++) {
- assertTrue("NetworkPolicies Marshall and Unmarshal Failed!",
- policies[i].equals(unmarshaled[i]));
- }
- } catch (NullPointerException npe) {
- assertTrue("Some policies were not marshaled/unmarshaled correctly", false);
- }
- }
-
- public void testMarshallNetworkPoliciesEdgeCases() {
- byte[] data = NetworkPolicySerializer.marshalNetworkPolicies(null);
- assertNotNull("NetworkPolicies marshal returned null!", data);
- assertEquals("NetworkPolicies marshal returned incomplete byte array", data.length, 0);
-
- data = NetworkPolicySerializer.marshalNetworkPolicies(new NetworkPolicy[0]);
- assertNotNull("NetworkPolicies marshal returned null for empty NetworkPolicy[]", data);
- assertEquals("NetworkPolicies marshal returned incomplete byte array for empty NetworkPolicy[]"
- , data.length, 0);
- }
-
- public void testUnmarshalNetworkPoliciesEdgeCases() {
- NetworkPolicy[] policies = NetworkPolicySerializer.unmarshalNetworkPolicies(null);
- assertNotNull("NetworkPolicies unmarshal returned null for null input. Expected: byte[0] ",
- policies);
- assertEquals("Non Empty NetworkPolicy[] returned for null input Expected: byte[0]",
- policies.length, 0);
-
- policies = NetworkPolicySerializer.unmarshalNetworkPolicies(new byte[0]);
- assertNotNull("NetworkPolicies unmarshal returned null for empty byte[] input. Expected: byte[0]",
- policies);
- assertEquals("Non Empty NetworkPolicy[] returned for empty byte[] input. Expected: byte[0]",
- policies.length, 0);
-
- policies = NetworkPolicySerializer.unmarshalNetworkPolicies(new byte[]{10, 20, 30, 40, 50, 60});
- assertNotNull("NetworkPolicies unmarshal returned null for incomplete byte[] input. " +
- "Expected: byte[0] ", policies);
- assertEquals("Non Empty NetworkPolicy[] returned for incomplete byte[] input Expected: byte[0]",
- policies.length, 0);
-
- }
-
- private NetworkPolicy[] getDummyNetworkPolicies(int num) {
- NetworkPolicy[] policies = new NetworkPolicy[num];
- for (int i = 0; i < num; i++) {
- policies[i] = getDummyNetworkPolicy();
- }
- return policies;
- }
-
- private NetworkPolicy getDummyNetworkPolicy() {
- NetworkTemplate template = new NetworkTemplate(NetworkTemplate.MATCH_MOBILE_ALL, "subId",
- "GoogleGuest");
- int cycleDay = sRandom.nextInt();
- String cycleTimezone = "timezone";
- long warningBytes = sRandom.nextLong();
- long limitBytes = sRandom.nextLong();
- long lastWarningSnooze = sRandom.nextLong();
- long lastLimitSnooze = sRandom.nextLong();
- boolean metered = sRandom.nextInt() % 2 == 0;
- boolean inferred = sRandom.nextInt() % 2 == 0;
- return new NetworkPolicy(template, cycleDay, cycleTimezone, warningBytes, limitBytes,
- lastWarningSnooze, lastLimitSnooze, metered, inferred);
- }
-
-}
diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java
index 5b83796..a93caca 100644
--- a/packages/Shell/src/com/android/shell/BugreportProgressService.java
+++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java
@@ -786,7 +786,8 @@
intent.addCategory(Intent.CATEGORY_DEFAULT);
intent.setType(mimeType);
- final String subject = info.title != null ? info.title : bugreportUri.getLastPathSegment();
+ final String subject = !TextUtils.isEmpty(info.title) ?
+ info.title : bugreportUri.getLastPathSegment();
intent.putExtra(Intent.EXTRA_SUBJECT, subject);
// EXTRA_TEXT should be an ArrayList, but some clients are expecting a single String.
@@ -832,7 +833,7 @@
+ mProcesses + "), using info from intent instead (" + info + ")");
}
- addDetailsToZipFile(info);
+ addDetailsToZipFile(mContext, info);
final Intent sendIntent = buildSendIntent(mContext, info);
final Intent notifIntent;
@@ -856,6 +857,10 @@
* Sends a notification indicating the bugreport has finished so use can share it.
*/
private static void sendBugreportNotification(Context context, BugreportInfo info) {
+
+ // Since adding the details can take a while, do it before notifying user.
+ addDetailsToZipFile(context, info);
+
final Intent shareIntent = new Intent(INTENT_BUGREPORT_SHARE);
shareIntent.setClass(context, BugreportProgressService.class);
shareIntent.setAction(INTENT_BUGREPORT_SHARE);
@@ -949,7 +954,7 @@
* If user provided a title, it will be saved into a {@code title.txt} entry; similarly, the
* description will be saved on {@code description.txt}.
*/
- private void addDetailsToZipFile(BugreportInfo info) {
+ private static void addDetailsToZipFile(Context context, BugreportInfo info) {
if (info.bugreportFile == null) {
// One possible reason is a bug in the Parcelization code.
Log.e(TAG, "INTERNAL ERROR: no bugreportFile on " + info);
@@ -959,10 +964,15 @@
Log.d(TAG, "Not touching zip file since neither title nor description are set");
return;
}
+ if (info.addedDetailsToZip || info.addingDetailsToZip) {
+ Log.d(TAG, "Already added details to zip file for " + info);
+ return;
+ }
+ info.addingDetailsToZip = true;
// It's not possible to add a new entry into an existing file, so we need to create a new
// zip, copy all entries, then rename it.
- sendBugreportBeingUpdatedNotification(mContext, info.pid); // ...and that takes time
+ sendBugreportBeingUpdatedNotification(context, info.pid); // ...and that takes time
final File dir = info.bugreportFile.getParentFile();
final File tmpZip = new File(dir, "tmp-" + info.bugreportFile.getName());
Log.d(TAG, "Writing temporary zip file (" + tmpZip + ") with title and/or description");
@@ -985,6 +995,7 @@
addEntry(zos, "title.txt", info.title);
addEntry(zos, "description.txt", info.description);
} catch (IOException e) {
+ info.addingDetailsToZip = false;
Log.e(TAG, "exception zipping file " + tmpZip, e);
return;
}
@@ -992,6 +1003,8 @@
if (!tmpZip.renameTo(info.bugreportFile)) {
Log.e(TAG, "Could not rename " + tmpZip + " to " + info.bugreportFile);
}
+ info.addedDetailsToZip = true;
+ info.addingDetailsToZip = false;
}
private static void addEntry(ZipOutputStream zos, String entry, String text)
@@ -1387,6 +1400,12 @@
boolean finished;
/**
+ * Whether the details entries have been added to the bugreport yet.
+ */
+ boolean addingDetailsToZip;
+ boolean addedDetailsToZip;
+
+ /**
* Internal counter used to name screenshot files.
*/
int screenshotCounter;
@@ -1466,7 +1485,9 @@
+ "\n\ttitle: " + title + "\n\tdescription: " + description
+ "\n\tfile: " + bugreportFile + "\n\tscreenshots: " + screenshotFiles
+ "\n\tprogress: " + progress + "/" + max + "(" + percent + ")"
- + "\n\tlast_update: " + getFormattedLastUpdate();
+ + "\n\tlast_update: " + getFormattedLastUpdate()
+ + "\naddingDetailsToZip: " + addingDetailsToZip
+ + " addedDetailsToZip: " + addedDetailsToZip;
}
// Parcelable contract
diff --git a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
index 5908d02..ea85c61 100644
--- a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
+++ b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
@@ -114,6 +114,8 @@
private static final String NO_SCREENSHOT = null;
private static final String NO_TITLE = null;
private static final Integer NO_PID = null;
+ private static final boolean RENAMED_SCREENSHOTS = true;
+ private static final boolean DIDNT_RENAME_SCREENSHOTS = false;
private String mDescription;
@@ -171,7 +173,7 @@
Bundle extras =
sendBugreportFinishedAndGetSharedIntent(PID, mPlainTextPath, mScreenshotPath);
assertActionSendMultiple(extras, BUGREPORT_CONTENT, SCREENSHOT_CONTENT, PID, ZIP_FILE,
- NAME, NO_TITLE, NO_DESCRIPTION, 1, true);
+ NAME, NO_TITLE, NO_DESCRIPTION, 1, RENAMED_SCREENSHOTS);
assertServiceNotRunning();
}
@@ -202,7 +204,7 @@
Bundle extras = acceptBugreportAndGetSharedIntent();
assertActionSendMultiple(extras, BUGREPORT_CONTENT, SCREENSHOT_CONTENT, PID, ZIP_FILE,
- NAME, NO_TITLE, NO_DESCRIPTION, 2, true);
+ NAME, NO_TITLE, NO_DESCRIPTION, 2, RENAMED_SCREENSHOTS);
assertServiceNotRunning();
}
@@ -231,13 +233,12 @@
Bundle extras = acceptBugreportAndGetSharedIntent();
assertActionSendMultiple(extras, BUGREPORT_CONTENT, NO_SCREENSHOT, PID, ZIP_FILE,
- NAME, NO_TITLE, NO_DESCRIPTION, 1, true);
+ NAME, NO_TITLE, NO_DESCRIPTION, 1, RENAMED_SCREENSHOTS);
assertServiceNotRunning();
}
public void testProgress_changeDetailsInvalidInput() throws Exception {
-
resetProperties();
sendBugreportStarted(1000);
waitForScreenshotButtonEnabled(true);
@@ -277,7 +278,7 @@
Bundle extras = sendBugreportFinishedAndGetSharedIntent(PID, mPlainTextPath,
mScreenshotPath);
assertActionSendMultiple(extras, BUGREPORT_CONTENT, SCREENSHOT_CONTENT, PID, TITLE,
- NEW_NAME, TITLE, mDescription, 1, true);
+ NEW_NAME, TITLE, mDescription, 1, RENAMED_SCREENSHOTS);
assertServiceNotRunning();
}
@@ -291,7 +292,6 @@
}
public void changeDetailsTest(boolean plainText) throws Exception {
-
resetProperties();
sendBugreportStarted(1000);
waitForScreenshotButtonEnabled(true);
@@ -316,7 +316,26 @@
Bundle extras = sendBugreportFinishedAndGetSharedIntent(PID,
plainText? mPlainTextPath : mZipPath, mScreenshotPath);
assertActionSendMultiple(extras, BUGREPORT_CONTENT, SCREENSHOT_CONTENT, PID, TITLE,
- NEW_NAME, TITLE, mDescription, 1, true);
+ NEW_NAME, TITLE, mDescription, 1, RENAMED_SCREENSHOTS);
+
+ assertServiceNotRunning();
+ }
+
+ public void testProgress_changeJustDetails() throws Exception {
+ resetProperties();
+ sendBugreportStarted(1000);
+ waitForScreenshotButtonEnabled(true);
+
+ DetailsUi detailsUi = new DetailsUi(mUiBot);
+
+ detailsUi.nameField.setText("");
+ detailsUi.titleField.setText("");
+ detailsUi.descField.setText(mDescription);
+ detailsUi.clickOk();
+
+ Bundle extras = sendBugreportFinishedAndGetSharedIntent(PID, mZipPath, mScreenshotPath);
+ assertActionSendMultiple(extras, BUGREPORT_CONTENT, SCREENSHOT_CONTENT, PID, ZIP_FILE,
+ NO_NAME, NO_TITLE, mDescription, 1, DIDNT_RENAME_SCREENSHOTS);
assertServiceNotRunning();
}
@@ -367,7 +386,7 @@
// Finally, share bugreport.
Bundle extras = acceptBugreportAndGetSharedIntent();
assertActionSendMultiple(extras, BUGREPORT_CONTENT, SCREENSHOT_CONTENT, PID, TITLE,
- NAME, TITLE, mDescription, 1, true);
+ NAME, TITLE, mDescription, 1, RENAMED_SCREENSHOTS);
assertServiceNotRunning();
}
@@ -539,7 +558,7 @@
private void assertActionSendMultiple(Bundle extras, String bugreportContent,
String screenshotContent) throws IOException {
assertActionSendMultiple(extras, bugreportContent, screenshotContent, PID, ZIP_FILE,
- NO_NAME, NO_TITLE, NO_DESCRIPTION, 0, false);
+ NO_NAME, NO_TITLE, NO_DESCRIPTION, 0, DIDNT_RENAME_SCREENSHOTS);
}
/**
diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk
index e4d0fec..88313bb 100644
--- a/packages/SystemUI/Android.mk
+++ b/packages/SystemUI/Android.mk
@@ -12,6 +12,7 @@
android-support-v7-preference \
android-support-v7-appcompat \
android-support-v14-preference \
+ android-support-v17-leanback \
framework-protos
LOCAL_JAVA_LIBRARIES := telephony-common
@@ -30,10 +31,12 @@
frameworks/support/v7/preference/res \
frameworks/support/v14/preference/res \
frameworks/support/v7/appcompat/res \
- frameworks/support/v7/recyclerview/res
+ frameworks/support/v7/recyclerview/res \
+ frameworks/support/v17/leanback/res
LOCAL_AAPT_FLAGS := --auto-add-overlay \
- --extra-packages com.android.keyguard:android.support.v7.recyclerview:android.support.v7.preference:android.support.v14.preference:android.support.v7.appcompat
+ --extra-packages com.android.keyguard:android.support.v7.recyclerview:android.support.v7.preference:android.support.v14.preference:android.support.v7.appcompat \
+ --extra-packages android.support.v17.leanback
ifneq ($(SYSTEM_UI_INCREMENTAL_BUILDS),)
LOCAL_PROGUARD_ENABLED := disabled
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 52b7b7d..2713fb5 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -155,10 +155,6 @@
<!-- TV picture-in-picture -->
<uses-permission android:name="android.permission.RECEIVE_MEDIA_RESOURCE_USAGE" />
- <!-- ChooserActivity -->
- <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
- <uses-permission android:name="android.permission.BIND_CHOOSER_TARGET_SERVICE" />
-
<application
android:name=".SystemUIApplication"
android:persistent="true"
@@ -240,6 +236,20 @@
</intent-filter>
</activity>
+ <activity android:name=".recents.tv.RecentsTvActivity"
+ android:label="@string/accessibility_desc_recent_apps"
+ android:exported="false"
+ android:launchMode="singleInstance"
+ android:excludeFromRecents="true"
+ android:stateNotNeeded="true"
+ android:resumeWhilePausing="true"
+ android:screenOrientation="behind"
+ android:theme="@style/RecentsTheme.Wallpaper">
+ <intent-filter>
+ <action android:name="com.android.systemui.recents.TOGGLE_RECENTS" />
+ </intent-filter>
+ </activity>
+
<!-- Callback for dismissing screenshot notification after a share target is picked -->
<receiver android:name=".screenshot.GlobalScreenshot$TargetChosenReceiver"
android:process=":screenshot"
@@ -442,20 +452,5 @@
<action android:name="com.android.systemui.action.CLEAR_TUNER" />
</intent-filter>
</receiver>
-
- <activity android:name=".chooser.ChooserActivity"
- android:theme="@*android:style/Theme.DeviceDefault.Resolver"
- android:finishOnCloseSystemDialogs="true"
- android:excludeFromRecents="true"
- android:documentLaunchMode="never"
- android:relinquishTaskIdentity="true"
- android:process=":chooser">
- <intent-filter>
- <action android:name="android.intent.action.CHOOSER" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.VOICE" />
- </intent-filter>
- </activity>
-
</application>
</manifest>
diff --git a/packages/SystemUI/res/drawable/recents_task_view_header_bg.xml b/packages/SystemUI/res/drawable/recents_task_view_header_bg.xml
deleted file mode 100644
index 745af33..0000000
--- a/packages/SystemUI/res/drawable/recents_task_view_header_bg.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="?android:attr/colorControlHighlight">
- <item android:drawable="@android:color/transparent" />
-</ripple>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/recents_task_view_header_bg_color.xml b/packages/SystemUI/res/drawable/recents_task_view_header_bg_color.xml
deleted file mode 100644
index 5f9341c..0000000
--- a/packages/SystemUI/res/drawable/recents_task_view_header_bg_color.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
- <corners android:topLeftRadius="@dimen/recents_task_view_rounded_corners_radius"
- android:topRightRadius="@dimen/recents_task_view_rounded_corners_radius"/>
- <solid android:color="#00000000" />
-</shape>
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout-sw600dp/navigation_layout_rot90.xml b/packages/SystemUI/res/layout-sw600dp/navigation_layout_rot90.xml
index 38265f6..6f98509 100644
--- a/packages/SystemUI/res/layout-sw600dp/navigation_layout_rot90.xml
+++ b/packages/SystemUI/res/layout-sw600dp/navigation_layout_rot90.xml
@@ -28,14 +28,16 @@
android:id="@+id/ends_group"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="horizontal" />
+ android:orientation="horizontal"
+ android:clipChildren="false" />
<LinearLayout
android:id="@+id/center_group"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
- android:orientation="horizontal" />
+ android:orientation="horizontal"
+ android:clipChildren="false" />
</FrameLayout>
diff --git a/packages/SystemUI/res/layout/keyboard_shortcut_app_item.xml b/packages/SystemUI/res/layout/keyboard_shortcut_app_item.xml
new file mode 100644
index 0000000..5a6553f
--- /dev/null
+++ b/packages/SystemUI/res/layout/keyboard_shortcut_app_item.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/keyboard_shortcuts_keyword_wrapper"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="24dp"
+ android:paddingEnd="24dp"
+ android:paddingBottom="8dp">
+ <TextView
+ android:id="@+id/keyboard_shortcuts_keyword"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingEnd="12dp"
+ android:background="@android:color/white"
+ android:textColor="#D9000000"
+ android:textSize="16sp"
+ android:maxLines="5"
+ android:singleLine="false"
+ android:scrollHorizontally="false"
+ android:layout_alignParentStart="true"
+ android:minWidth="100dp"
+ android:maxWidth="260dp"/>
+ <!--TODO: introduce and use a layout that allows wrapping and right align -->
+ <LinearLayout
+ android:id="@+id/keyboard_shortcuts_item_container"
+ android:layout_toEndOf="@+id/keyboard_shortcuts_keyword"
+ android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@android:color/white"
+ android:layout_alignParentEnd="true"
+ android:gravity="end"
+ android:textSize="14sp"
+ android:paddingStart="0dp"
+ android:paddingEnd="0dp"
+ android:scrollHorizontally="false"
+ android:minWidth="100dp"
+ android:maxWidth="260dp"/>
+</RelativeLayout>
diff --git a/packages/SystemUI/res/layout/keyboard_shortcuts_category_title.xml b/packages/SystemUI/res/layout/keyboard_shortcuts_category_title.xml
new file mode 100644
index 0000000..80a478a
--- /dev/null
+++ b/packages/SystemUI/res/layout/keyboard_shortcuts_category_title.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:textSize="14sp"
+ android:paddingStart="24dp"
+ android:paddingTop="20dp"
+ android:paddingEnd="24dp"
+ android:paddingBottom="13dp" />
diff --git a/packages/SystemUI/res/layout/keyboard_shortcuts_container.xml b/packages/SystemUI/res/layout/keyboard_shortcuts_container.xml
new file mode 100644
index 0000000..fa07eb1
--- /dev/null
+++ b/packages/SystemUI/res/layout/keyboard_shortcuts_container.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+</LinearLayout>
diff --git a/packages/SystemUI/res/layout/keyboard_shortcuts_key_view.xml b/packages/SystemUI/res/layout/keyboard_shortcuts_key_view.xml
new file mode 100644
index 0000000..5002c12
--- /dev/null
+++ b/packages/SystemUI/res/layout/keyboard_shortcuts_key_view.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="4dp"
+ android:padding="4dp"
+ android:background="#EEEEEE"
+ android:textColor="#8C000000"
+ android:singleLine="true"
+ android:textSize="14sp"/>
diff --git a/packages/SystemUI/res/layout/keyboard_shortcuts_view.xml b/packages/SystemUI/res/layout/keyboard_shortcuts_view.xml
index 460433e..77b1264 100644
--- a/packages/SystemUI/res/layout/keyboard_shortcuts_view.xml
+++ b/packages/SystemUI/res/layout/keyboard_shortcuts_view.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2015 The Android Open Source Project
+ ~ Copyright (C) 2016 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -14,11 +14,25 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-<RelativeLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/keyboard_shortcuts_wrapper"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginTop="40dp"
- android:focusable="true">
-</RelativeLayout>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/keyboard_shortcuts_wrapper"
+ android:layout_width="488dp"
+ android:layout_height="wrap_content"
+ android:focusable="true">
+ <ScrollView
+ android:id="@+id/keyboard_shortcuts_scroll_view"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:layout_weight="1">
+ <LinearLayout
+ android:id="@+id/keyboard_shortcuts_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"/>
+ </ScrollView>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="?android:attr/listDivider"/>
+</LinearLayout>
diff --git a/packages/SystemUI/res/layout/keyboard_shortcuts_wrapper.xml b/packages/SystemUI/res/layout/keyboard_shortcuts_wrapper.xml
new file mode 100644
index 0000000..802acfe
--- /dev/null
+++ b/packages/SystemUI/res/layout/keyboard_shortcuts_wrapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+</LinearLayout>
diff --git a/packages/SystemUI/res/layout/navigation_layout.xml b/packages/SystemUI/res/layout/navigation_layout.xml
index f9a3653..142d13a 100644
--- a/packages/SystemUI/res/layout/navigation_layout.xml
+++ b/packages/SystemUI/res/layout/navigation_layout.xml
@@ -29,14 +29,16 @@
android:id="@+id/ends_group"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="horizontal" />
+ android:orientation="horizontal"
+ android:clipChildren="false" />
<LinearLayout
android:id="@+id/center_group"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
- android:orientation="horizontal" />
+ android:orientation="horizontal"
+ android:clipChildren="false" />
</FrameLayout>
diff --git a/packages/SystemUI/res/layout/navigation_layout_rot90.xml b/packages/SystemUI/res/layout/navigation_layout_rot90.xml
index df32911..3b7b369 100644
--- a/packages/SystemUI/res/layout/navigation_layout_rot90.xml
+++ b/packages/SystemUI/res/layout/navigation_layout_rot90.xml
@@ -29,14 +29,16 @@
android:id="@+id/ends_group"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical" />
+ android:orientation="vertical"
+ android:clipChildren="false" />
<com.android.systemui.statusbar.phone.ReverseLinearLayout
android:id="@+id/center_group"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
- android:orientation="vertical" />
+ android:orientation="vertical"
+ android:clipChildren="false" />
</FrameLayout>
diff --git a/packages/SystemUI/res/layout/recents_on_tv.xml b/packages/SystemUI/res/layout/recents_on_tv.xml
new file mode 100644
index 0000000..b4543bd
--- /dev/null
+++ b/packages/SystemUI/res/layout/recents_on_tv.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.android.systemui.recents.tv.views.RecentsTvView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/recents_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipChildren="false"
+ android:clipToPadding="false" >
+
+ <com.android.systemui.recents.tv.views.TaskStackHorizontalGridView
+ android:id="@+id/task_list"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:clipChildren="false"
+ android:clipToPadding="false"
+ android:descendantFocusability="beforeDescendants"
+ android:gravity="center"
+ android:paddingStart="@dimen/recents_tv_grid_row_padding"
+ android:paddingEnd="@dimen/recents_tv_grid_row_padding"
+ android:focusable="true"/>
+
+</com.android.systemui.recents.tv.views.RecentsTvView>
+
diff --git a/packages/SystemUI/res/layout/recents_task_card_view.xml b/packages/SystemUI/res/layout/recents_task_card_view.xml
new file mode 100644
index 0000000..fa1daad
--- /dev/null
+++ b/packages/SystemUI/res/layout/recents_task_card_view.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.android.systemui.recents.tv.views.TaskCardView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:layout_gravity="center"
+ android:layout_centerInParent="true">
+
+ <RelativeLayout
+ android:layout_width="@dimen/recents_tv_card_width"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:layout_gravity="center">
+ <ImageView
+ android:id="@+id/card_view_thumbnail"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/recents_tv_card_height"
+ android:scaleType="centerCrop"
+ android:gravity="center"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"/>
+
+ <RelativeLayout
+ android:id="@+id/card_info_field"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/card_view_thumbnail"
+ android:background="@color/recents_tv_card_background_color" >
+ <TextView
+ android:id="@+id/card_title_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="false"
+ android:includeFontPadding="true"
+ android:minLines="1"
+ android:maxLines="2"
+ android:textColor="@color/recents_tv_card_title_text_color"
+ android:ellipsize="end" />
+ <TextView
+ android:id="@+id/card_content_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:layout_below="@id/card_title_text"
+ android:includeFontPadding="true"
+ android:minLines="1"
+ android:maxLines="2"
+ android:textColor="@color/recents_tv_card_content_text_color"
+ android:ellipsize="end" />
+ <ImageView
+ android:id="@+id/card_extra_badge"
+ android:layout_width="@dimen/recents_tv_card_extra_badge_size"
+ android:layout_height="@dimen/recents_tv_card_extra_badge_size"
+ android:scaleType="fitCenter"
+ android:background="@android:color/transparent"
+ android:contentDescription="@null"
+ android:layout_centerVertical="true"
+ android:layout_alignParentRight="true"/>
+ </RelativeLayout>
+ </RelativeLayout>
+</com.android.systemui.recents.tv.views.TaskCardView>
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/recents_task_view_header.xml b/packages/SystemUI/res/layout/recents_task_view_header.xml
index 5c67f80..deb8e91 100644
--- a/packages/SystemUI/res/layout/recents_task_view_header.xml
+++ b/packages/SystemUI/res/layout/recents_task_view_header.xml
@@ -49,8 +49,9 @@
android:layout_marginEnd="@dimen/recents_task_view_header_button_width"
android:layout_gravity="center_vertical|end"
android:padding="15dp"
- android:background="@drawable/recents_button_bg"
android:src="@drawable/star"
+ android:background="?android:selectableItemBackground"
+ android:alpha="0"
android:visibility="gone" />
<com.android.systemui.recents.views.FixedSizeImageView
android:id="@+id/dismiss_task"
@@ -58,9 +59,10 @@
android:layout_height="@dimen/recents_task_view_header_button_height"
android:layout_gravity="center_vertical|end"
android:padding="15dp"
- android:background="@drawable/recents_button_bg"
- android:visibility="invisible"
- android:src="@drawable/recents_dismiss_light" />
+ android:src="@drawable/recents_dismiss_light"
+ android:background="?android:selectableItemBackground"
+ android:alpha="0"
+ android:visibility="gone" />
<!-- The progress indicator shows if auto-paging is enabled -->
<ViewStub android:id="@+id/focus_timer_indicator_stub"
diff --git a/packages/SystemUI/res/layout/recents_task_view_header_overlay.xml b/packages/SystemUI/res/layout/recents_task_view_header_overlay.xml
index dabfc80..10659a3 100644
--- a/packages/SystemUI/res/layout/recents_task_view_header_overlay.xml
+++ b/packages/SystemUI/res/layout/recents_task_view_header_overlay.xml
@@ -45,6 +45,6 @@
android:layout_height="@dimen/recents_task_bar_height"
android:layout_gravity="center_vertical|end"
android:padding="15dp"
- android:background="@drawable/recents_button_bg"
+ android:background="?android:selectableItemBackground"
android:src="@drawable/recents_info_light" />
</FrameLayout>
\ No newline at end of file
diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml
index f1000ff..4972828 100644
--- a/packages/SystemUI/res/values-af/strings.xml
+++ b/packages/SystemUI/res/values-af/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Geen SIM nie."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Sellulêre data is af"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth-verbinding."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Vliegtuigmodus."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Geen SIM-kaart nie."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"skermvaspen"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"soek"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Kon nie <xliff:g id="APP">%s</xliff:g> begin nie."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Meer"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> meer"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Geskiedenis"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Vee uit"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Verdeel horisontaal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Verdeel vertikaal"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Verdeel gepasmaak"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Normale kleure"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Aandkleure"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Gepasmaakte kleure"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Outo"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Onbekende kleure"</string>
<string name="color_transform" msgid="6985460408079086090">"Kleurverandering"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Wys kitsinstellings-teël"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Oorfone is gekoppel"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Kopstuk is gekoppel"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Aktiveer of deaktiveer ikone om op die statusbalk gewys te word."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Databespaarder"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Databespaarder is aan"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Databespaarder is af"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Aan"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigasiebalk"</string>
+ <string name="start" msgid="6873794757232879664">"Begin"</string>
+ <string name="center" msgid="4327473927066010960">"Middel"</string>
+ <string name="end" msgid="125797972524818282">"Einde"</string>
+ <string name="space" msgid="804232271282109749">"Spasieerder"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Kieslys / Sleutelbordwisselaar"</string>
+ <string name="select_button" msgid="1597989540662710653">"Kies knoppie om by te voeg"</string>
+ <string name="add_button" msgid="4134946063432258161">"Voeg knoppie by"</string>
+ <string name="save" msgid="2311877285724540644">"Stoor"</string>
+ <string name="reset" msgid="2448168080964209908">"Stel terug"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Geen tuisknoppie is gevind nie"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"\'n Tuisknoppie word vereis sodat daar op hierdie toestel genavigeer kan word. Voeg asseblief \'n tuisknoppie by voordat jy stoor."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Verstel knoppiebreedte"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Knipbord"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Die knipbord laat toe dat items direk na die knipbord getrek word. Items kan ook direk vanaf die knipbord getrek word, indien dit daar is."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Gepasmaakte navigasieknoppie"</string>
+ <string name="keycode" msgid="7335281375728356499">"Sleutelkode"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Sleutelbordknoppies maak dit moontlik dat sleutelbordsleutels by die navigasiebalk gevoeg kan word. Wanneer hulle gedruk word, doen hulle dieselfde as die gekose sleutelbordsleutel. Eers moet die sleutel vir die knoppie gekies word, gevolg deur \'n prent wat op die knoppie gewys sal word."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Kies Sleutelbordknoppie"</string>
+ <string name="preview" msgid="9077832302472282938">"Voorskou"</string>
</resources>
diff --git a/packages/SystemUI/res/values-af/strings_tv.xml b/packages/SystemUI/res/values-af/strings_tv.xml
deleted file mode 100644
index afb7fec..0000000
--- a/packages/SystemUI/res/values-af/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Maak PIP toe"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Volskerm"</string>
- <string name="pip_play" msgid="674145557658227044">"Speel"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Laat wag"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Kanselleer"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Hou HOME om PIP te beheer"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml
index fa8dc9d..2fa8012 100644
--- a/packages/SystemUI/res/values-am/strings.xml
+++ b/packages/SystemUI/res/values-am/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"ምንም SIM የለም።"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"የተንቀሳቃሽ ስልክ ውሂብ ጠፍቷል"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"ብሉቱዝ ማያያዝ።"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"የአውሮፕላን ሁነታ።"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"ምንም SIM ካርድ የለም።"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ማያ ገጽ መሰካት"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ፈልግ"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g>ን መጀመር አልተቻለም።"</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"ተጨማሪ"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> ተጨማሪ"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"ታሪክ"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"ጥረግ"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"አግድም ክፈል"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ቁልቁል ክፈል"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"በብጁ ክፈል"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"መደበኛ ቀለሞች"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"የለሊት ቀለሞች"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"ብጁ ቀለሞች"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"ራስ-ሰር"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"የማይታወቁ ቀለሞች"</string>
<string name="color_transform" msgid="6985460408079086090">"የቀለም ማሻሻያ"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"የፈጣን ቅንብሮች ሰቅን አሳይ"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"የጆር ማዳመጫዎች ተገናኝተዋል"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"የጆሮ ማዳመጫ ተገናኝቷል"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"አዶዎች በሁኔታ አሞሌ ላይ እንዲታዩ ወይም እንዳይታዩ ያንቁ ወይም ያሰናክሉ።"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"ውሂብ ቆጣቢ"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"ውሂብ ቆጣቢ በርቷል"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"ውሂብ ቆጣቢ ጠፍቷል"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"በርቷል"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"የአሰሳ አሞሌ"</string>
+ <string name="start" msgid="6873794757232879664">"ጀምር"</string>
+ <string name="center" msgid="4327473927066010960">"መሃል"</string>
+ <string name="end" msgid="125797972524818282">"መጨረሻ"</string>
+ <string name="space" msgid="804232271282109749">"ክፍተት ሰጪ"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"ምናሌ / የቁልፍ ሰሌዳ መቀየሪያ"</string>
+ <string name="select_button" msgid="1597989540662710653">"የሚታከል አዝራር ይምረጡ"</string>
+ <string name="add_button" msgid="4134946063432258161">"አዝራር አክል"</string>
+ <string name="save" msgid="2311877285724540644">"አስቀምጥ"</string>
+ <string name="reset" msgid="2448168080964209908">"ዳግም አስጀምር"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"ምንም የመነሻ አዝራር አልተገኘም"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"ይህን መሣሪያ ማሰስ ለመቻል የመነሻ አዝራር ያስፈልጋል። እባክዎ ከማስቀመጥዎ በፊት የመነሻ አዝራር ያክሉ።"</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"የአዝራር ስፋት አስተካክል"</string>
+ <string name="clipboard" msgid="1313879395099896312">"የቅንጥብ ሰሌዳ"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"የቅንጥብ ሰሌዳው ንጥሎች በቀጥታ ወደ ቅንጥብ ሰሌዳው እንዲጎተቱ ያስችላል። እንዲሁም ሲኖር ንጥሎች በቀጥታ ከቅንጥብ ሰሌዳው ውጭ ሊጎተቱ ይችላሉ።"</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"ብጁ የአሰሳ አዝራር"</string>
+ <string name="keycode" msgid="7335281375728356499">"የቁልፍ ኮድ"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"የቁልፍ ኮድ አዝራሮች የቁልፍ ሰሌዳ ቁልፎች ወደ የአሰሳ አሞሌው እንዲታከሉ ያስችላሉ። ሲጫኑ የተመረጠውን የቁልፍ ሰሌዳ ቁልፍ ያስመስላሉ። መጀመሪያ ቁልፉ ለአዝራሩ መመረጥ አለበት፣ ከዚያ በመቀጠል በአዝራሩ ላይ የሚታየው ምስል መመረጥ አለበት።"</string>
+ <string name="select_keycode" msgid="7413765103381924584">"የቁልፍ ሰሌዳ አዝራር ይምረጡ"</string>
+ <string name="preview" msgid="9077832302472282938">"ቅድመ-እይታ"</string>
</resources>
diff --git a/packages/SystemUI/res/values-am/strings_tv.xml b/packages/SystemUI/res/values-am/strings_tv.xml
deleted file mode 100644
index 0184601..0000000
--- a/packages/SystemUI/res/values-am/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIPን ዝጋ"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"ሙሉ ማያ ገጽ"</string>
- <string name="pip_play" msgid="674145557658227044">"አጫውት"</string>
- <string name="pip_pause" msgid="8412075640017218862">"ለአፍታ አቁም"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"ይቅር"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIPን ለመቆጣጠር መነሻን ተጭነው ይያዙ"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml
index 10853bf..2b80354 100644
--- a/packages/SystemUI/res/values-ar/strings.xml
+++ b/packages/SystemUI/res/values-ar/strings.xml
@@ -150,6 +150,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"ليست هناك شريحة SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"تم تعطيل بيانات شبكة الجوّال"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"ربط البلوتوث."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"وضع الطائرة."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"ليس هناك شريحة SIM."</string>
@@ -304,8 +305,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"تثبيت الشاشة"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"بحث"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"تعذر بدء <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"المزيد"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> أخرى"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"السجلّ"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"محو"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"تقسيم أفقي"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"تقسيم رأسي"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"تقسيم مخصص"</string>
@@ -471,6 +472,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"ألوان عادية"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"ألوان ليلية"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"ألوان مخصصة"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"تلقائي"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"ألوان غير معروفة"</string>
<string name="color_transform" msgid="6985460408079086090">"إشعار الألوان"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"إظهار قسم الإعدادات السريعة"</string>
@@ -497,10 +499,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"تم توصيل سماعات رأس"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"تم توصيل سماعات رأس"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"يمكنك تمكين أو تعطيل الرموز بحيث لا تظهر في شريط الحالة."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"توفير البيانات"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"تم تشغيل توفير البيانات"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"تم تعطيل توفير البيانات"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"تشغيل"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"شريط التنقل"</string>
+ <string name="start" msgid="6873794757232879664">"البدء"</string>
+ <string name="center" msgid="4327473927066010960">"وسط"</string>
+ <string name="end" msgid="125797972524818282">"النهاية"</string>
+ <string name="space" msgid="804232271282109749">"أداة المباعدة"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"مبدِّل القوائم / لوحة المفاتيح"</string>
+ <string name="select_button" msgid="1597989540662710653">"تحديد الزر لإضافته"</string>
+ <string name="add_button" msgid="4134946063432258161">"إضافة زر"</string>
+ <string name="save" msgid="2311877285724540644">"حفظ"</string>
+ <string name="reset" msgid="2448168080964209908">"إعادة تعيين"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"لم يُعثر على زر صفحة رئيسية"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"زر الصفحة الرئيسية مطلوب لكي تتمكن من التنقل في هذا الجهاز، الرجاء إضافة زر صفحة رئيسية قبل الحفظ."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"ضبط عرض الزر"</string>
+ <string name="clipboard" msgid="1313879395099896312">"الحافظة"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"تتيح الحافظة إمكانية سحب العناصر مباشرة إلى الحافظة، وكذلك يمكن سحب العناصر مباشرة خارج الحافظة عند وجودها."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"زر التنقل المخصص"</string>
+ <string name="keycode" msgid="7335281375728356499">"رمز المفتاح"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"تتيح أزرار رموز المفاتيح إمكانية إضافة مفاتيح لوحة المفاتيح إلى شريط التنقل. وعند الضغط عليها، تحاكي الأزرار مفتاح لوحة المفاتيح المحدد. ويجب أولاً تحديد المفتاح للزر، وبعد ذلك تحديد صورة لكي يتم عرضها على الزر."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"تحديد زر لوحة المفاتيح"</string>
+ <string name="preview" msgid="9077832302472282938">"معاينة"</string>
</resources>
diff --git a/packages/SystemUI/res/values-ar/strings_tv.xml b/packages/SystemUI/res/values-ar/strings_tv.xml
deleted file mode 100644
index 28329d5..0000000
--- a/packages/SystemUI/res/values-ar/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"إغلاق PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"ملء الشاشة"</string>
- <string name="pip_play" msgid="674145557658227044">"تشغيل"</string>
- <string name="pip_pause" msgid="8412075640017218862">"إيقاف مؤقت"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"إلغاء"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"اضغط مع الاستمرار على \"الرئيسية\" للتحكم في PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-az-rAZ/strings.xml b/packages/SystemUI/res/values-az-rAZ/strings.xml
index 00b78b2..a21253f 100644
--- a/packages/SystemUI/res/values-az-rAZ/strings.xml
+++ b/packages/SystemUI/res/values-az-rAZ/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"SIM yoxdur"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobil Data Deaktivdir"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth tezering."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Uçuş rejimi"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"SIM kart yoxdur."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ekran sancağı"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"axtarış"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> başlana bilmir."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Daha çox"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> Daha çox"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Tarixçə"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Təmizləyin"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Üfüqi Böl"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Şaquli Böl"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Fərdi Böl"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Normal rənglər"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Gecə rəngləri"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Xüsusi rənglər"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Avto"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Naməlum rəng"</string>
<string name="color_transform" msgid="6985460408079086090">"Rəng modifikasiyası"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Cəld ayarlar örtüyünü göstərin"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Qulaqlıq qoşulub"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Qulaqlıq qoşulub"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"İkonaların status panelində görünməsini aktiv və ya deaktiv edin."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Data Qənaəti"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Data Qənaəti aktivdir"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Data Qənaəti deaktivdir"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Aktiv"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Naviqasiya paneli"</string>
+ <string name="start" msgid="6873794757232879664">"Başladın"</string>
+ <string name="center" msgid="4327473927066010960">"Mərkəz"</string>
+ <string name="end" msgid="125797972524818282">"Son"</string>
+ <string name="space" msgid="804232271282109749">"Boşluq"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menyu / Klaviatura Keçirici"</string>
+ <string name="select_button" msgid="1597989540662710653">"Əlavə etmək üçün düymə seçin"</string>
+ <string name="add_button" msgid="4134946063432258161">"Düymə əlavə edin"</string>
+ <string name="save" msgid="2311877285724540644">"Saxlayın"</string>
+ <string name="reset" msgid="2448168080964209908">"Sıfırlayın"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Heç bir əsas ekran düyməsi tapılmadı"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Bu cihazı idarə etmək üçün əsas düymə tələb olunur. Yaddaşda saxlamadan əvvəl əsas düyməni əlavə edin."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Düymənin enini nizamlayın"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Pano"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Elementlərin sürüşdürərək birbaşa panoya əlavə olunmasına icazə verir. Mövcud olduqda elementlər pano kənarından da sürüşdürərək birbaşa panoya əlavə oluna bilər."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Fərdi naviqasiya düyməsi"</string>
+ <string name="keycode" msgid="7335281375728356499">"Açar kodu"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Açar kodu düymələri klaviatura açarlarının Naviqasiya Panelinə əlavə olunmasına icazə verir. Basıldıqda seçilmiş klaviatura açarını yaradır. İlk olaraq düymə üçün düymə üzərində göstərilən şəkilə uyğun açar seçilməlidir."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Klaviatura Düyməsi Seçin"</string>
+ <string name="preview" msgid="9077832302472282938">"Önizləmə"</string>
</resources>
diff --git a/packages/SystemUI/res/values-az-rAZ/strings_tv.xml b/packages/SystemUI/res/values-az-rAZ/strings_tv.xml
deleted file mode 100644
index 8f3be27..0000000
--- a/packages/SystemUI/res/values-az-rAZ/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP bağlayın"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Tam ekran"</string>
- <string name="pip_play" msgid="674145557658227044">"Göstərin"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Fasilə verin"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Ləğv edin"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP idarə etmək üçün ƏSAS düyməni basıb saxlayın"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml
index 4b3f157..cb1549b 100644
--- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml
+++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml
@@ -147,6 +147,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Nema SIM kartice."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Podaci za mobilne uređaje su isključeni"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth privezivanje."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Režim rada u avionu."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Nema SIM kartice."</string>
@@ -301,8 +302,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"kačenje ekrana"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"pretraži"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Pokretanje aplikacije <xliff:g id="APP">%s</xliff:g> nije uspelo."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Još"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Još <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Istorija"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Obriši"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Podeli horizontalno"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Podeli vertikalno"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Prilagođeno deljenje"</string>
@@ -468,6 +469,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Normalne boje"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Noćne boje"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Prilagođene boje"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automatski"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Nepoznate boje"</string>
<string name="color_transform" msgid="6985460408079086090">"Izmena boja"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Prikaži pločicu Brza podešavanja"</string>
@@ -494,10 +496,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Slušalice su povezane"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Naglavne slušalice su povezane"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Omogućite ili onemogućite prikazivanje ikona na statusnoj traci."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Ušteda podataka"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Ušteda podataka je uključena"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Ušteda podataka je isključena"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Uključeno"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Traka za navigaciju"</string>
+ <string name="start" msgid="6873794757232879664">"Pokreni"</string>
+ <string name="center" msgid="4327473927066010960">"Centar"</string>
+ <string name="end" msgid="125797972524818282">"Dno"</string>
+ <string name="space" msgid="804232271282109749">"Oznaka za razmak"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Meni/Tastatura prebacivač"</string>
+ <string name="select_button" msgid="1597989540662710653">"Izaberite dugme za dodavanje"</string>
+ <string name="add_button" msgid="4134946063432258161">"Dodaj dugme"</string>
+ <string name="save" msgid="2311877285724540644">"Sačuvaj"</string>
+ <string name="reset" msgid="2448168080964209908">"Ponovo postavi"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Nismo pronašli dugme Početna"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Dugme Početna je neophodno za navigaciju na ovom uređaju. Dodajte dugme Početna pre nego što sačuvate izmene."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Prilagodi širinu dugmeta"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Privremena memorija"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Privremena memorija omogućava da se stavke prevlače direktno u privremenu memoriju. Postojeće stavke mogu da se prevlače i direktno iz privremene memorije."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Prilagođeno dugme za navigaciju"</string>
+ <string name="keycode" msgid="7335281375728356499">"Kôd tastera"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Dugmad za kodove tastera omogućava da se na traku za navigaciju dodaju tasteri na tastaturi. Kada pritisnete dugme, simulira se izabrani taster na tastaturi. Prvo morate da izaberete taster za dugme, pa sliku koju će se prikazivati na dugmetu."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Izaberite dugme za tastaturu"</string>
+ <string name="preview" msgid="9077832302472282938">"Pregled"</string>
</resources>
diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml b/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml
deleted file mode 100644
index 7d35b20..0000000
--- a/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Zatvori PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Ceo ekran"</string>
- <string name="pip_play" msgid="674145557658227044">"Pusti"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pauziraj"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Otkaži"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Zadržite taster za POČETNI EKRAN da biste kontrolisali PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml
index a5fdd8e..606144a 100644
--- a/packages/SystemUI/res/values-bg/strings.xml
+++ b/packages/SystemUI/res/values-bg/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Няма SIM карта."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Мобилните данни са изключени"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Тетъринг през Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Самолетен режим."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Няма SIM карта."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"фиксиране на екрана"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"търсене"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> не можа да стартира."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Още"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Още <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"История"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Изчистване"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Хоризонтално разделяне"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Вертикално разделяне"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Персонализирано разделяне"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Нормални цветове"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Нощни цветове"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Персонализирани цветове"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Автоматично"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Неизвестни цветове"</string>
<string name="color_transform" msgid="6985460408079086090">"Промяна на цветовете"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Показване на плочката за бързи настройки"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Слушалките (без микрофон) са свързани"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Слушалките са свързани"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Активиране или деактивиране на показването на икони в лентата на състоянието."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Икономия на данни"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Функцията „Икономия на данни“ е включена"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Функцията „Икономия на данни“ е изключена"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Вкл."</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Лента за навигация"</string>
+ <string name="start" msgid="6873794757232879664">"Начало"</string>
+ <string name="center" msgid="4327473927066010960">"Център"</string>
+ <string name="end" msgid="125797972524818282">"Край"</string>
+ <string name="space" msgid="804232271282109749">"Разстояние между бутоните"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Превкл. на менюто/клавиатурата"</string>
+ <string name="select_button" msgid="1597989540662710653">"Избиране на бутон за добавяне"</string>
+ <string name="add_button" msgid="4134946063432258161">"Добавяне на бутон"</string>
+ <string name="save" msgid="2311877285724540644">"Запазване"</string>
+ <string name="reset" msgid="2448168080964209908">"Повторно задаване"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Няма намерен бутон „Начало“"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"За да се придвижвате в това устройство, е необходим бутон „Начало“. Моля, добавете такъв, преди да запазите."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Коригиране на ширината на бутона"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Буферна памет"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Този бутон ви дава възможност да премествате с плъзгане елементи директно в буферната памет, а също и извън нея."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Персонализиран бутон за навигация"</string>
+ <string name="keycode" msgid="7335281375728356499">"Клавишен код"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Бутоните с клавишни кодове ви дават възможност да добавяте клавиши от клавиатурата към лентата за навигация. При докосване на такъв бутон се симулира натискане на съответния клавиш. Първо, трябва да изберете клавиш за бутона, а след това – изображение, което да се показва върху него."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Избиране на клавиш от клавиатурата"</string>
+ <string name="preview" msgid="9077832302472282938">"Визуализация"</string>
</resources>
diff --git a/packages/SystemUI/res/values-bg/strings_tv.xml b/packages/SystemUI/res/values-bg/strings_tv.xml
deleted file mode 100644
index 82c2d08..0000000
--- a/packages/SystemUI/res/values-bg/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Затваряне на режима „Картина в картина“"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Цял екран"</string>
- <string name="pip_play" msgid="674145557658227044">"Пускане"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Пауза"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Отказ"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Задръжте „HOME“, за да контролирате режима „Картина в картина“"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-bn-rBD/strings.xml b/packages/SystemUI/res/values-bn-rBD/strings.xml
index d6f5868..3ece957 100644
--- a/packages/SystemUI/res/values-bn-rBD/strings.xml
+++ b/packages/SystemUI/res/values-bn-rBD/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"কোনো সিম নেই৷"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"সেলুলার ডেটা বন্ধ আছে"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth টিথারিং৷"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"বিমান মোড৷"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"কোনো SIM কার্ড নেই।"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"স্ক্রীন পিন করা"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"অনুসন্ধান"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> শুরু করা যায়নি৷"</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"আরো"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"আরো <xliff:g id="NUMBER">%d</xliff:g>টি"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"ইতিহাস"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"সাফ করুন"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"অনুভূমিক স্প্লিট"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"উল্লম্ব স্প্লিট"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"কাস্টম স্প্লিট করুন"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"স্বাভাবিক রঙ"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"রাতের রঙ"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"কাস্টম রঙ"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"স্বয়ংক্রিয়ভাবে"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"অজানা রঙ"</string>
<string name="color_transform" msgid="6985460408079086090">"রঙ সংশোধন"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"দ্রুত সেটিংস টাইল দেখান"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"হেডফোনগুলি সংযুক্ত হয়েছে"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"হেডসেট সংযুক্ত হয়েছে"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"স্থিতি দন্ডে দেখানোর জন্য আইকনগুলিকে সক্ষম বা অক্ষম করুন৷"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"ডেটা সেভার"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"ডেটা সেভার চালু আছে"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"ডেটা সেভার বন্ধ আছে"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"চালু আছে"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"নেভিগেশন দন্ড"</string>
+ <string name="start" msgid="6873794757232879664">"শুরু করুন"</string>
+ <string name="center" msgid="4327473927066010960">"কেন্দ্র"</string>
+ <string name="end" msgid="125797972524818282">"শেষ"</string>
+ <string name="space" msgid="804232271282109749">"স্পেসার"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"মেনু / কীবোর্ড স্যুইচার"</string>
+ <string name="select_button" msgid="1597989540662710653">"যোগ করার জন্য বোতাম নির্বাচন করুন"</string>
+ <string name="add_button" msgid="4134946063432258161">"বোতাম যোগ করুন"</string>
+ <string name="save" msgid="2311877285724540644">"সংরক্ষণ করুন"</string>
+ <string name="reset" msgid="2448168080964209908">"পুনরায় সেট করুন"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"কোনো হোম বোতাম পাওয়া যায় নি"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"এই ডিভাইসটিকে নেভিগেট করার জন্য একটি হোম বোতামের প্রয়োজন। সংরক্ষণ করার আগে অনুগ্রহ করে একটি হোম বোতাম যোগ করুন।"</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"বোতামের প্রস্থ সমন্বয় করুন"</string>
+ <string name="clipboard" msgid="1313879395099896312">"ক্লিপবোর্ড"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"ক্লিপবোর্ড আইটেমগুলিকে সরাসরি ক্লিপবোর্ডে টেনে আনার অনুমতি দেয়। ক্লিপবোর্ডের বাইরে হাজির থাকার সময়েও আইটেমগুলিকে সরাসরি টেনে আনা যায়।"</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"কাস্টম নেভিগেশান বোতাম"</string>
+ <string name="keycode" msgid="7335281375728356499">"কীকোড"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"কীকোড বোতামগুলি নেভিগেশান দন্ডে কীবোর্ডের কীগুলি যোগ করার অনুমতি দেয়। চাপ দেওয়ার সময়ে সেগুলি নির্বাচিত কীবোর্ডের কী কে অনুকরণ করে। বোতামে দেখানো হয়েছে এমন একটি চিত্রকে অনুসরণ করে অবশ্যই প্রথমে বোতামের জন্য কী নির্বাচন করতে হবে।"</string>
+ <string name="select_keycode" msgid="7413765103381924584">"কীবোর্ডের বোতাম নির্বাচন করুন"</string>
+ <string name="preview" msgid="9077832302472282938">"পূর্বরূপ দেখুন"</string>
</resources>
diff --git a/packages/SystemUI/res/values-bn-rBD/strings_tv.xml b/packages/SystemUI/res/values-bn-rBD/strings_tv.xml
deleted file mode 100644
index 15d0e82..0000000
--- a/packages/SystemUI/res/values-bn-rBD/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP বন্ধ করুন"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"পূর্ণ স্ক্রীন"</string>
- <string name="pip_play" msgid="674145557658227044">"চালান"</string>
- <string name="pip_pause" msgid="8412075640017218862">"বিরাম দিন"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"বাতিল করুন"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP নিয়ন্ত্রণ করতে HOME ধরে রাখুন"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-bs-rBA/strings.xml b/packages/SystemUI/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..fe4cca2
--- /dev/null
+++ b/packages/SystemUI/res/values-bs-rBA/strings.xml
@@ -0,0 +1,988 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright (c) 2009, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- no translation found for app_label (7164937344850004466) -->
+ <skip />
+ <!-- no translation found for status_bar_clear_all_button (7774721344716731603) -->
+ <skip />
+ <!-- no translation found for status_bar_recent_remove_item_title (6026395868129852968) -->
+ <skip />
+ <!-- no translation found for status_bar_recent_inspect_item_title (7793624864528818569) -->
+ <skip />
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
+ <!-- no translation found for status_bar_accessibility_dismiss_recents (4576076075226540105) -->
+ <skip />
+ <!-- no translation found for status_bar_accessibility_recent_apps (9138535907802238759) -->
+ <!-- no translation found for status_bar_no_notifications_title (4755261167193833213) -->
+ <skip />
+ <!-- no translation found for status_bar_ongoing_events_title (1682504513316879202) -->
+ <skip />
+ <!-- no translation found for status_bar_latest_events_title (6594767438577593172) -->
+ <skip />
+ <!-- no translation found for battery_low_title (6456385927409742437) -->
+ <skip />
+ <!-- no translation found for battery_low_percent_format (2900940511201380775) -->
+ <skip />
+ <!-- no translation found for battery_low_percent_format_saver_started (6859235584035338833) -->
+ <skip />
+ <!-- no translation found for invalid_charger (4549105996740522523) -->
+ <skip />
+ <!-- no translation found for invalid_charger_title (3515740382572798460) -->
+ <skip />
+ <!-- no translation found for invalid_charger_text (5474997287953892710) -->
+ <skip />
+ <!-- no translation found for battery_low_why (4553600287639198111) -->
+ <skip />
+ <!-- no translation found for battery_saver_confirmation_title (5299585433050361634) -->
+ <skip />
+ <!-- no translation found for battery_saver_confirmation_ok (7507968430447930257) -->
+ <skip />
+ <!-- no translation found for battery_saver_start_action (5576697451677486320) -->
+ <skip />
+ <!-- no translation found for status_bar_settings_settings_button (3023889916699270224) -->
+ <skip />
+ <!-- no translation found for status_bar_settings_wifi_button (1733928151698311923) -->
+ <skip />
+ <!-- no translation found for status_bar_settings_auto_rotation (3790482541357798421) -->
+ <skip />
+ <!-- no translation found for status_bar_settings_mute_label (554682549917429396) -->
+ <skip />
+ <!-- no translation found for status_bar_settings_auto_brightness_label (511453614962324674) -->
+ <skip />
+ <!-- no translation found for status_bar_settings_notifications (397146176280905137) -->
+ <skip />
+ <!-- no translation found for bluetooth_tethered (7094101612161133267) -->
+ <skip />
+ <!-- no translation found for status_bar_input_method_settings_configure_input_methods (3504292471512317827) -->
+ <skip />
+ <!-- no translation found for status_bar_use_physical_keyboard (7551903084416057810) -->
+ <skip />
+ <!-- no translation found for usb_device_permission_prompt (834698001271562057) -->
+ <skip />
+ <!-- no translation found for usb_accessory_permission_prompt (5171775411178865750) -->
+ <skip />
+ <!-- no translation found for usb_device_confirm_prompt (5161205258635253206) -->
+ <skip />
+ <!-- no translation found for usb_accessory_confirm_prompt (3808984931830229888) -->
+ <skip />
+ <!-- no translation found for usb_accessory_uri_prompt (513450621413733343) -->
+ <skip />
+ <!-- no translation found for title_usb_accessory (4966265263465181372) -->
+ <skip />
+ <!-- no translation found for label_view (6304565553218192990) -->
+ <skip />
+ <!-- no translation found for always_use_device (1450287437017315906) -->
+ <skip />
+ <!-- no translation found for always_use_accessory (1210954576979621596) -->
+ <skip />
+ <!-- no translation found for usb_debugging_title (4513918393387141949) -->
+ <skip />
+ <!-- no translation found for usb_debugging_message (2220143855912376496) -->
+ <skip />
+ <!-- no translation found for usb_debugging_always (303335496705863070) -->
+ <skip />
+ <!-- no translation found for usb_debugging_secondary_user_title (6353808721761220421) -->
+ <skip />
+ <!-- no translation found for usb_debugging_secondary_user_message (8572228137833020196) -->
+ <skip />
+ <!-- no translation found for compat_mode_on (6623839244840638213) -->
+ <skip />
+ <!-- no translation found for compat_mode_off (4434467572461327898) -->
+ <skip />
+ <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
+ <skip />
+ <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
+ <skip />
+ <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
+ <skip />
+ <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
+ <skip />
+ <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
+ <skip />
+ <!-- no translation found for screenshot_failed_title (705781116746922771) -->
+ <skip />
+ <!-- no translation found for screenshot_failed_text (1260203058661337274) -->
+ <skip />
+ <!-- no translation found for usb_preference_title (6551050377388882787) -->
+ <skip />
+ <!-- no translation found for use_mtp_button_title (4333504413563023626) -->
+ <skip />
+ <!-- no translation found for use_ptp_button_title (7517127540301625751) -->
+ <skip />
+ <!-- no translation found for installer_cd_button_title (2312667578562201583) -->
+ <skip />
+ <!-- no translation found for accessibility_back (567011538994429120) -->
+ <skip />
+ <!-- no translation found for accessibility_home (8217216074895377641) -->
+ <skip />
+ <!-- no translation found for accessibility_menu (316839303324695949) -->
+ <skip />
+ <!-- no translation found for accessibility_recent (5208608566793607626) -->
+ <skip />
+ <!-- no translation found for accessibility_search_light (1103867596330271848) -->
+ <skip />
+ <!-- no translation found for accessibility_camera_button (8064671582820358152) -->
+ <skip />
+ <!-- no translation found for accessibility_phone_button (6738112589538563574) -->
+ <skip />
+ <!-- no translation found for accessibility_voice_assist_button (487611083884852965) -->
+ <skip />
+ <!-- no translation found for accessibility_unlock_button (128158454631118828) -->
+ <skip />
+ <!-- no translation found for accessibility_unlock_button_fingerprint (8214125623493923751) -->
+ <skip />
+ <!-- no translation found for accessibility_unlock_without_fingerprint (7541705575183694446) -->
+ <skip />
+ <!-- no translation found for unlock_label (8779712358041029439) -->
+ <skip />
+ <!-- no translation found for phone_label (2320074140205331708) -->
+ <skip />
+ <!-- no translation found for voice_assist_label (3956854378310019854) -->
+ <skip />
+ <!-- no translation found for camera_label (7261107956054836961) -->
+ <skip />
+ <!-- no translation found for recents_caption_resize (3517056471774958200) -->
+ <skip />
+ <!-- no translation found for cancel (6442560571259935130) -->
+ <skip />
+ <!-- no translation found for accessibility_compatibility_zoom_button (8461115318742350699) -->
+ <skip />
+ <!-- no translation found for accessibility_compatibility_zoom_example (4220687294564945780) -->
+ <skip />
+ <!-- no translation found for accessibility_bluetooth_connected (2707027633242983370) -->
+ <skip />
+ <!-- no translation found for accessibility_bluetooth_disconnected (7416648669976870175) -->
+ <skip />
+ <!-- no translation found for accessibility_no_battery (358343022352820946) -->
+ <skip />
+ <!-- no translation found for accessibility_battery_one_bar (7774887721891057523) -->
+ <skip />
+ <!-- no translation found for accessibility_battery_two_bars (8500650438735009973) -->
+ <skip />
+ <!-- no translation found for accessibility_battery_three_bars (2302983330865040446) -->
+ <skip />
+ <!-- no translation found for accessibility_battery_full (8909122401720158582) -->
+ <skip />
+ <!-- no translation found for accessibility_no_phone (4894708937052611281) -->
+ <skip />
+ <!-- no translation found for accessibility_phone_one_bar (687699278132664115) -->
+ <skip />
+ <!-- no translation found for accessibility_phone_two_bars (8384905382804815201) -->
+ <skip />
+ <!-- no translation found for accessibility_phone_three_bars (8521904843919971885) -->
+ <skip />
+ <!-- no translation found for accessibility_phone_signal_full (6471834868580757898) -->
+ <skip />
+ <!-- no translation found for accessibility_no_data (4791966295096867555) -->
+ <skip />
+ <!-- no translation found for accessibility_data_one_bar (1415625833238273628) -->
+ <skip />
+ <!-- no translation found for accessibility_data_two_bars (6166018492360432091) -->
+ <skip />
+ <!-- no translation found for accessibility_data_three_bars (9167670452395038520) -->
+ <skip />
+ <!-- no translation found for accessibility_data_signal_full (2708384608124519369) -->
+ <skip />
+ <!-- no translation found for accessibility_wifi_name (7202151365171148501) -->
+ <skip />
+ <!-- no translation found for accessibility_bluetooth_name (8441517146585531676) -->
+ <skip />
+ <!-- no translation found for accessibility_no_wimax (4329180129727630368) -->
+ <skip />
+ <!-- no translation found for accessibility_wimax_one_bar (4170994299011863648) -->
+ <skip />
+ <!-- no translation found for accessibility_wimax_two_bars (9176236858336502288) -->
+ <skip />
+ <!-- no translation found for accessibility_wimax_three_bars (6116551636752103927) -->
+ <skip />
+ <!-- no translation found for accessibility_wimax_signal_full (2768089986795579558) -->
+ <skip />
+ <!-- no translation found for accessibility_ethernet_disconnected (5896059303377589469) -->
+ <skip />
+ <!-- no translation found for accessibility_ethernet_connected (2692130313069182636) -->
+ <skip />
+ <!-- no translation found for accessibility_no_signal (7064645320782585167) -->
+ <skip />
+ <!-- no translation found for accessibility_not_connected (6395326276213402883) -->
+ <skip />
+ <!-- no translation found for accessibility_zero_bars (3806060224467027887) -->
+ <skip />
+ <!-- no translation found for accessibility_one_bar (1685730113192081895) -->
+ <skip />
+ <!-- no translation found for accessibility_two_bars (6437363648385206679) -->
+ <skip />
+ <!-- no translation found for accessibility_three_bars (2648241415119396648) -->
+ <skip />
+ <!-- no translation found for accessibility_signal_full (9122922886519676839) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_on (2385254693624345265) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_off (6475508157786853157) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_connected (8366256693719499665) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_connecting (3812924520316280149) -->
+ <skip />
+ <!-- no translation found for accessibility_data_connection_gprs (1606477224486747751) -->
+ <skip />
+ <!-- no translation found for accessibility_data_connection_1x (994133468120244018) -->
+ <skip />
+ <!-- no translation found for accessibility_data_connection_hspa (2032328855462645198) -->
+ <skip />
+ <!-- no translation found for accessibility_data_connection_3g (8628562305003568260) -->
+ <skip />
+ <!-- no translation found for accessibility_data_connection_3.5g (8664845609981692001) -->
+ <skip />
+ <!-- no translation found for accessibility_data_connection_4g (7741000750630089612) -->
+ <skip />
+ <!-- no translation found for accessibility_data_connection_lte (5413468808637540658) -->
+ <skip />
+ <!-- no translation found for accessibility_data_connection_cdma (6132648193978823023) -->
+ <skip />
+ <!-- no translation found for accessibility_data_connection_roaming (5977362333466556094) -->
+ <skip />
+ <!-- no translation found for accessibility_data_connection_edge (4477457051631979278) -->
+ <skip />
+ <!-- no translation found for accessibility_data_connection_wifi (2324496756590645221) -->
+ <skip />
+ <!-- no translation found for accessibility_no_sim (8274017118472455155) -->
+ <skip />
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobilni podaci isključeni"</string>
+ <!-- no translation found for accessibility_bluetooth_tether (4102784498140271969) -->
+ <skip />
+ <!-- no translation found for accessibility_airplane_mode (834748999790763092) -->
+ <skip />
+ <!-- no translation found for accessibility_no_sims (3957997018324995781) -->
+ <skip />
+ <!-- no translation found for accessibility_carrier_network_change_mode (4017301580441304305) -->
+ <skip />
+ <!-- no translation found for accessibility_battery_level (7451474187113371965) -->
+ <skip />
+ <!-- no translation found for accessibility_settings_button (799583911231893380) -->
+ <skip />
+ <!-- no translation found for accessibility_notifications_button (4498000369779421892) -->
+ <skip />
+ <!-- no translation found for accessibility_remove_notification (3603099514902182350) -->
+ <skip />
+ <!-- no translation found for accessibility_gps_enabled (3511469499240123019) -->
+ <skip />
+ <!-- no translation found for accessibility_gps_acquiring (8959333351058967158) -->
+ <skip />
+ <!-- no translation found for accessibility_tty_enabled (4613200365379426561) -->
+ <skip />
+ <!-- no translation found for accessibility_ringer_vibrate (666585363364155055) -->
+ <skip />
+ <!-- no translation found for accessibility_ringer_silent (9061243307939135383) -->
+ <skip />
+ <!-- no translation found for accessibility_casting (6887382141726543668) -->
+ <skip />
+ <!-- no translation found for accessibility_work_mode (2478631941714607225) -->
+ <skip />
+ <!-- no translation found for accessibility_recents_item_will_be_dismissed (395770242498031481) -->
+ <skip />
+ <!-- no translation found for accessibility_recents_item_dismissed (6803574935084867070) -->
+ <skip />
+ <!-- no translation found for accessibility_recents_all_items_dismissed (4464697366179168836) -->
+ <skip />
+ <!-- no translation found for accessibility_recents_item_launched (7616039892382525203) -->
+ <skip />
+ <!-- no translation found for accessibility_recents_task_header (1437183540924535457) -->
+ <skip />
+ <!-- no translation found for accessibility_notification_dismissed (854211387186306927) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_notification_shade (4690274844447504208) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_quick_settings (6186378411582437046) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_lock_screen (5625143713611759164) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_settings (3417884241751434521) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_recent_apps (4876900986661819788) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_close (7479755364962766729) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_user (1104846699869476855) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_wifi (5518210213118181692) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_wifi_changed_off (8716484460897819400) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_wifi_changed_on (6440117170789528622) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_mobile (4876806564086241341) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_battery (1480931583381408972) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_airplane_off (7786329360056634412) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_airplane_on (6406141469157599296) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_airplane_changed_off (66846307818850664) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_airplane_changed_on (8983005603505087728) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_dnd_priority_on (1448402297221249355) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_dnd_none_on (6882582132662613537) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_dnd_alarms_on (9152834845587554157) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_dnd_off (2371832603753738581) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_dnd_changed_off (898107593453022935) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_dnd_changed_on (4483780856613561039) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_bluetooth_off (2133631372372064339) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_bluetooth_on (7681999166216621838) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_bluetooth_connecting (6953242966685343855) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_bluetooth_connected (4306637793614573659) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_bluetooth_changed_off (2730003763480934529) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_bluetooth_changed_on (8722351798763206577) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_location_off (5119080556976115520) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_location_on (5809937096590102036) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_location_changed_off (8526845571503387376) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_location_changed_on (339403053079338468) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_alarm (3959908972897295660) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_close (3115847794692516306) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_more_time (3659274935356197708) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_less_time (2404728746293515623) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_flashlight_off (4936432000069786988) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_flashlight_on (2003479320007841077) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_flashlight_changed_off (3303701786768224304) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_flashlight_changed_on (6531793301533894686) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_color_inversion_changed_off (4406577213290173911) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_color_inversion_changed_on (6897462320184911126) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_hotspot_changed_off (5004708003447561394) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_hotspot_changed_on (2890951609226476206) -->
+ <skip />
+ <!-- no translation found for accessibility_casting_turned_off (1430668982271976172) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_work_mode_off (7045417396436552890) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_work_mode_on (7650588553988014341) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_work_mode_changed_off (5605534876107300711) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_work_mode_changed_on (249840330756998612) -->
+ <skip />
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
+ <!-- no translation found for data_usage_disabled_dialog_3g_title (5281770593459841889) -->
+ <skip />
+ <!-- no translation found for data_usage_disabled_dialog_4g_title (1601769736881078016) -->
+ <skip />
+ <!-- no translation found for data_usage_disabled_dialog_mobile_title (4651001290947318931) -->
+ <skip />
+ <!-- no translation found for data_usage_disabled_dialog_title (3932437232199671967) -->
+ <skip />
+ <!-- no translation found for data_usage_disabled_dialog (8453242888903772524) -->
+ <skip />
+ <!-- no translation found for data_usage_disabled_dialog_enable (1412395410306390593) -->
+ <skip />
+ <!-- no translation found for status_bar_settings_signal_meter_disconnected (1940231521274147771) -->
+ <skip />
+ <!-- no translation found for status_bar_settings_signal_meter_wifi_nossid (6557486452774597820) -->
+ <skip />
+ <!-- no translation found for gps_notification_searching_text (8574247005642736060) -->
+ <skip />
+ <!-- no translation found for gps_notification_found_text (4619274244146446464) -->
+ <skip />
+ <!-- no translation found for accessibility_location_active (2427290146138169014) -->
+ <skip />
+ <!-- no translation found for accessibility_clear_all (5235938559247164925) -->
+ <skip />
+ <!-- no translation found for status_bar_notification_inspect_item_title (5668348142410115323) -->
+ <skip />
+ <!-- no translation found for status_bar_notification_app_settings_title (5525260160341558869) -->
+ <skip />
+ <!-- no translation found for accessibility_rotation_lock_off (4062780228931590069) -->
+ <skip />
+ <!-- no translation found for accessibility_rotation_lock_on_landscape (6731197337665366273) -->
+ <skip />
+ <!-- no translation found for accessibility_rotation_lock_on_portrait (5809367521644012115) -->
+ <skip />
+ <!-- no translation found for accessibility_rotation_lock_off_changed (8134601071026305153) -->
+ <skip />
+ <!-- no translation found for accessibility_rotation_lock_on_landscape_changed (3135965553707519743) -->
+ <skip />
+ <!-- no translation found for accessibility_rotation_lock_on_portrait_changed (8922481981834012126) -->
+ <skip />
+ <!-- no translation found for dessert_case (1295161776223959221) -->
+ <skip />
+ <!-- no translation found for start_dreams (7219575858348719790) -->
+ <skip />
+ <!-- no translation found for ethernet_label (7967563676324087464) -->
+ <skip />
+ <!-- no translation found for quick_settings_dnd_label (8735855737575028208) -->
+ <skip />
+ <!-- no translation found for quick_settings_dnd_priority_label (483232950670692036) -->
+ <skip />
+ <!-- no translation found for quick_settings_dnd_alarms_label (2559229444312445858) -->
+ <skip />
+ <!-- no translation found for quick_settings_dnd_none_label (5025477807123029478) -->
+ <skip />
+ <!-- no translation found for quick_settings_bluetooth_label (6304190285170721401) -->
+ <skip />
+ <!-- no translation found for quick_settings_bluetooth_multiple_devices_label (3912245565613684735) -->
+ <skip />
+ <!-- no translation found for quick_settings_bluetooth_off_label (8159652146149219937) -->
+ <skip />
+ <!-- no translation found for quick_settings_bluetooth_detail_empty_text (4910015762433302860) -->
+ <skip />
+ <!-- no translation found for quick_settings_brightness_label (6968372297018755815) -->
+ <skip />
+ <!-- no translation found for quick_settings_rotation_unlocked_label (7305323031808150099) -->
+ <skip />
+ <!-- no translation found for quick_settings_rotation_locked_label (6359205706154282377) -->
+ <skip />
+ <!-- no translation found for quick_settings_rotation_locked_portrait_label (5102691921442135053) -->
+ <skip />
+ <!-- no translation found for quick_settings_rotation_locked_landscape_label (8553157770061178719) -->
+ <skip />
+ <!-- no translation found for quick_settings_ime_label (7073463064369468429) -->
+ <skip />
+ <!-- no translation found for quick_settings_location_label (5011327048748762257) -->
+ <skip />
+ <!-- no translation found for quick_settings_location_off_label (7464544086507331459) -->
+ <skip />
+ <!-- no translation found for quick_settings_media_device_label (1302906836372603762) -->
+ <skip />
+ <!-- no translation found for quick_settings_rssi_label (7725671335550695589) -->
+ <skip />
+ <!-- no translation found for quick_settings_rssi_emergency_only (2713774041672886750) -->
+ <skip />
+ <!-- no translation found for quick_settings_settings_label (5326556592578065401) -->
+ <skip />
+ <!-- no translation found for quick_settings_time_label (4635969182239736408) -->
+ <skip />
+ <!-- no translation found for quick_settings_user_label (5238995632130897840) -->
+ <skip />
+ <!-- no translation found for quick_settings_user_title (4467690427642392403) -->
+ <skip />
+ <!-- no translation found for quick_settings_user_new_user (9030521362023479778) -->
+ <skip />
+ <!-- no translation found for quick_settings_wifi_label (9135344704899546041) -->
+ <skip />
+ <!-- no translation found for quick_settings_wifi_not_connected (7171904845345573431) -->
+ <skip />
+ <!-- no translation found for quick_settings_wifi_no_network (2221993077220856376) -->
+ <skip />
+ <!-- no translation found for quick_settings_wifi_off_label (7558778100843885864) -->
+ <skip />
+ <!-- no translation found for quick_settings_wifi_detail_empty_text (269990350383909226) -->
+ <skip />
+ <!-- no translation found for quick_settings_cast_title (7709016546426454729) -->
+ <skip />
+ <!-- no translation found for quick_settings_casting (6601710681033353316) -->
+ <skip />
+ <!-- no translation found for quick_settings_cast_device_default_name (5367253104742382945) -->
+ <skip />
+ <!-- no translation found for quick_settings_cast_device_default_description (2484573682378634413) -->
+ <skip />
+ <!-- no translation found for quick_settings_cast_detail_empty_text (311785821261640623) -->
+ <skip />
+ <!-- no translation found for quick_settings_brightness_dialog_title (8599674057673605368) -->
+ <skip />
+ <!-- no translation found for quick_settings_brightness_dialog_auto_brightness_label (5064982743784071218) -->
+ <skip />
+ <!-- no translation found for quick_settings_inversion_label (8790919884718619648) -->
+ <skip />
+ <!-- no translation found for quick_settings_color_space_label (853443689745584770) -->
+ <skip />
+ <!-- no translation found for quick_settings_more_settings (326112621462813682) -->
+ <skip />
+ <!-- no translation found for quick_settings_done (3402999958839153376) -->
+ <skip />
+ <!-- no translation found for quick_settings_connected (1722253542984847487) -->
+ <skip />
+ <!-- no translation found for quick_settings_connecting (47623027419264404) -->
+ <skip />
+ <!-- no translation found for quick_settings_tethering_label (7153452060448575549) -->
+ <skip />
+ <!-- no translation found for quick_settings_hotspot_label (6046917934974004879) -->
+ <skip />
+ <!-- no translation found for quick_settings_notifications_label (4818156442169154523) -->
+ <skip />
+ <!-- no translation found for quick_settings_flashlight_label (2133093497691661546) -->
+ <skip />
+ <!-- no translation found for quick_settings_cellular_detail_title (8575062783675171695) -->
+ <skip />
+ <!-- no translation found for quick_settings_cellular_detail_data_usage (1964260360259312002) -->
+ <skip />
+ <!-- no translation found for quick_settings_cellular_detail_remaining_data (722715415543541249) -->
+ <skip />
+ <!-- no translation found for quick_settings_cellular_detail_over_limit (967669665390990427) -->
+ <skip />
+ <!-- no translation found for quick_settings_cellular_detail_data_used (1476810587475761478) -->
+ <skip />
+ <!-- no translation found for quick_settings_cellular_detail_data_limit (56011158504994128) -->
+ <skip />
+ <!-- no translation found for quick_settings_cellular_detail_data_warning (2440098045692399009) -->
+ <skip />
+ <!-- no translation found for quick_settings_work_mode_label (6244915274350490429) -->
+ <skip />
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
+ <!-- no translation found for recents_app_info_button_label (2890317189376000030) -->
+ <skip />
+ <!-- no translation found for recents_lock_to_app_button_label (6942899049072506044) -->
+ <skip />
+ <!-- no translation found for recents_search_bar_label (8074997400187836677) -->
+ <skip />
+ <!-- no translation found for recents_launch_error_message (2969287838120550506) -->
+ <skip />
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Historija"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Obriši"</string>
+ <!-- no translation found for recents_multistack_add_stack_dialog_split_horizontal (8848514474543427332) -->
+ <skip />
+ <!-- no translation found for recents_multistack_add_stack_dialog_split_vertical (9075292233696180813) -->
+ <skip />
+ <!-- no translation found for recents_multistack_add_stack_dialog_split_custom (4177837597513701943) -->
+ <skip />
+ <!-- no translation found for expanded_header_battery_charged (5945855970267657951) -->
+ <skip />
+ <!-- no translation found for expanded_header_battery_charging (205623198487189724) -->
+ <skip />
+ <!-- no translation found for expanded_header_battery_charging_with_time (457559884275395376) -->
+ <skip />
+ <!-- no translation found for expanded_header_battery_not_charging (4798147152367049732) -->
+ <skip />
+ <!-- no translation found for ssl_ca_cert_warning (9005954106902053641) -->
+ <skip />
+ <!-- no translation found for description_target_search (3091587249776033139) -->
+ <skip />
+ <!-- no translation found for description_direction_up (7169032478259485180) -->
+ <skip />
+ <!-- no translation found for description_direction_left (7207478719805562165) -->
+ <skip />
+ <!-- no translation found for zen_priority_introduction (3070506961866919502) -->
+ <skip />
+ <!-- no translation found for zen_priority_customize_button (7948043278226955063) -->
+ <skip />
+ <!-- no translation found for zen_silence_introduction_voice (2284540992298200729) -->
+ <skip />
+ <!-- no translation found for zen_silence_introduction (3137882381093271568) -->
+ <skip />
+ <!-- no translation found for keyguard_more_overflow_text (9195222469041601365) -->
+ <skip />
+ <!-- no translation found for speed_bump_explanation (1288875699658819755) -->
+ <skip />
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
+ <!-- no translation found for keyguard_unlock (8043466894212841998) -->
+ <skip />
+ <!-- no translation found for phone_hint (4872890986869209950) -->
+ <skip />
+ <!-- no translation found for voice_hint (8939888732119726665) -->
+ <skip />
+ <!-- no translation found for camera_hint (7939688436797157483) -->
+ <skip />
+ <!-- no translation found for interruption_level_none_with_warning (5114872171614161084) -->
+ <skip />
+ <!-- no translation found for interruption_level_none (6000083681244492992) -->
+ <skip />
+ <!-- no translation found for interruption_level_priority (6426766465363855505) -->
+ <skip />
+ <!-- no translation found for interruption_level_alarms (5226306993448328896) -->
+ <skip />
+ <!-- no translation found for interruption_level_none_twoline (3957581548190765889) -->
+ <skip />
+ <!-- no translation found for interruption_level_priority_twoline (1564715335217164124) -->
+ <skip />
+ <!-- no translation found for interruption_level_alarms_twoline (3266909566410106146) -->
+ <skip />
+ <!-- no translation found for interruption_level_all (1330581184930945764) -->
+ <skip />
+ <!-- no translation found for interruption_level_all_twoline (3719402899156124780) -->
+ <skip />
+ <!-- no translation found for keyguard_indication_charging_time (1757251776872835768) -->
+ <skip />
+ <!-- no translation found for keyguard_indication_charging_time_fast (9018981952053914986) -->
+ <skip />
+ <!-- no translation found for keyguard_indication_charging_time_slowly (955252797961724952) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_switcher_with_current (8434880595284601601) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_inactive (1424081831468083402) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
+ <!-- no translation found for user_add_user (5110251524486079492) -->
+ <skip />
+ <!-- no translation found for user_new_user_name (426540612051178753) -->
+ <skip />
+ <!-- no translation found for guest_nickname (8059989128963789678) -->
+ <skip />
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <!-- no translation found for guest_exit_guest (7187359342030096885) -->
+ <skip />
+ <!-- no translation found for guest_exit_guest_dialog_title (8480693520521766688) -->
+ <skip />
+ <!-- no translation found for guest_exit_guest_dialog_message (4155503224769676625) -->
+ <skip />
+ <!-- no translation found for guest_exit_guest_dialog_remove (7402231963862520531) -->
+ <skip />
+ <!-- no translation found for guest_wipe_session_title (6419439912885956132) -->
+ <skip />
+ <!-- no translation found for guest_wipe_session_message (8476238178270112811) -->
+ <skip />
+ <!-- no translation found for guest_wipe_session_wipe (5065558566939858884) -->
+ <skip />
+ <!-- no translation found for guest_wipe_session_dontwipe (1401113462524894716) -->
+ <skip />
+ <!-- no translation found for guest_notification_title (1585278533840603063) -->
+ <skip />
+ <!-- no translation found for guest_notification_text (335747957734796689) -->
+ <skip />
+ <!-- no translation found for guest_notification_remove_action (8820670703892101990) -->
+ <skip />
+ <!-- no translation found for user_logout_notification_title (1453960926437240727) -->
+ <skip />
+ <!-- no translation found for user_logout_notification_text (3350262809611876284) -->
+ <skip />
+ <!-- no translation found for user_logout_notification_action (1195428991423425062) -->
+ <skip />
+ <!-- no translation found for user_add_user_title (4553596395824132638) -->
+ <!-- no translation found for user_add_user_title (2108112641783146007) -->
+ <skip />
+ <!-- no translation found for user_add_user_message_short (2161624834066214559) -->
+ <!-- no translation found for user_add_user_message_short (1511354412249044381) -->
+ <skip />
+ <!-- no translation found for user_remove_user_title (4681256956076895559) -->
+ <skip />
+ <!-- no translation found for user_remove_user_message (1453218013959498039) -->
+ <skip />
+ <!-- no translation found for user_remove_user_remove (7479275741742178297) -->
+ <skip />
+ <!-- no translation found for battery_saver_notification_title (237918726750955859) -->
+ <skip />
+ <!-- no translation found for battery_saver_notification_text (820318788126672692) -->
+ <skip />
+ <!-- no translation found for battery_saver_notification_action_text (109158658238110382) -->
+ <skip />
+ <!-- no translation found for media_projection_dialog_text (3071431025448218928) -->
+ <skip />
+ <!-- no translation found for media_projection_remember_text (3103510882172746752) -->
+ <skip />
+ <!-- no translation found for clear_all_notifications_text (814192889771462828) -->
+ <skip />
+ <!-- no translation found for media_projection_action_text (8470872969457985954) -->
+ <skip />
+ <!-- no translation found for empty_shade_text (708135716272867002) -->
+ <skip />
+ <!-- no translation found for device_owned_footer (3802752663326030053) -->
+ <skip />
+ <!-- no translation found for profile_owned_footer (8021888108553696069) -->
+ <skip />
+ <!-- no translation found for vpn_footer (2388611096129106812) -->
+ <skip />
+ <!-- no translation found for monitoring_title_device_owned (7121079311903859610) -->
+ <skip />
+ <!-- no translation found for monitoring_title_profile_owned (6790109874733501487) -->
+ <skip />
+ <!-- no translation found for monitoring_title (169206259253048106) -->
+ <skip />
+ <!-- no translation found for disable_vpn (4435534311510272506) -->
+ <skip />
+ <!-- no translation found for disconnect_vpn (1324915059568548655) -->
+ <skip />
+ <!-- no translation found for monitoring_description_device_owned (5780988291898461883) -->
+ <skip />
+ <!-- no translation found for monitoring_description_vpn (4445150119515393526) -->
+ <skip />
+ <!-- no translation found for monitoring_description_vpn_device_owned (3090670777499161246) -->
+ <skip />
+ <!-- no translation found for monitoring_description_vpn_profile_owned (2054949132145039290) -->
+ <skip />
+ <!-- no translation found for legacy_vpn_name (6604123105765737830) -->
+ <skip />
+ <!-- no translation found for monitoring_description_app (6259179342284742878) -->
+ <skip />
+ <!-- no translation found for monitoring_description_app_personal (484599052118316268) -->
+ <skip />
+ <!-- no translation found for monitoring_description_app_work (1754325860918060897) -->
+ <skip />
+ <!-- no translation found for monitoring_description_app_personal_work (4946600443852045903) -->
+ <skip />
+ <!-- no translation found for monitoring_description_vpn_app_device_owned (4970443827043261703) -->
+ <skip />
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
+ <!-- no translation found for hidden_notifications_title (7139628534207443290) -->
+ <skip />
+ <!-- no translation found for hidden_notifications_text (2326409389088668981) -->
+ <skip />
+ <!-- no translation found for hidden_notifications_cancel (3690709735122344913) -->
+ <skip />
+ <!-- no translation found for hidden_notifications_setup (41079514801976810) -->
+ <skip />
+ <!-- no translation found for zen_mode_and_condition (4462471036429759903) -->
+ <skip />
+ <!-- no translation found for volume_zen_end_now (3179845345429841822) -->
+ <skip />
+ <!-- no translation found for accessibility_volume_expand (5946812790999244205) -->
+ <skip />
+ <!-- no translation found for accessibility_volume_collapse (3609549593031810875) -->
+ <skip />
+ <!-- no translation found for screen_pinning_title (3273740381976175811) -->
+ <skip />
+ <!-- no translation found for screen_pinning_description (3577937698406151604) -->
+ <skip />
+ <!-- no translation found for screen_pinning_positive (3783985798366751226) -->
+ <skip />
+ <!-- no translation found for screen_pinning_negative (3741602308343880268) -->
+ <skip />
+ <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) -->
+ <skip />
+ <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) -->
+ <skip />
+ <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) -->
+ <skip />
+ <!-- no translation found for volumeui_prompt_message (918680947433389110) -->
+ <skip />
+ <!-- no translation found for volumeui_prompt_allow (7954396902482228786) -->
+ <skip />
+ <!-- no translation found for volumeui_prompt_deny (5720663643411696731) -->
+ <skip />
+ <!-- no translation found for volumeui_notification_title (4906770126345910955) -->
+ <skip />
+ <!-- no translation found for volumeui_notification_text (1826889705095768656) -->
+ <skip />
+ <!-- no translation found for group_summary_concadenation (6846402378100148789) -->
+ <skip />
+ <!-- no translation found for managed_profile_foreground_toast (5421487114739245972) -->
+ <skip />
+ <!-- no translation found for system_ui_tuner (708224127392452018) -->
+ <skip />
+ <!-- no translation found for show_battery_percentage (5444136600512968798) -->
+ <skip />
+ <!-- no translation found for show_battery_percentage_summary (3215025775576786037) -->
+ <skip />
+ <!-- no translation found for quick_settings (10042998191725428) -->
+ <skip />
+ <!-- no translation found for status_bar (4877645476959324760) -->
+ <skip />
+ <!-- no translation found for overview (4018602013895926956) -->
+ <skip />
+ <!-- no translation found for demo_mode (2389163018533514619) -->
+ <skip />
+ <!-- no translation found for enable_demo_mode (4844205668718636518) -->
+ <skip />
+ <!-- no translation found for show_demo_mode (2018336697782464029) -->
+ <skip />
+ <!-- no translation found for status_bar_ethernet (5044290963549500128) -->
+ <skip />
+ <!-- no translation found for status_bar_alarm (8536256753575881818) -->
+ <skip />
+ <!-- no translation found for status_bar_work (6022553324802866373) -->
+ <skip />
+ <!-- no translation found for status_bar_airplane (7057575501472249002) -->
+ <skip />
+ <!-- no translation found for add_tile (2995389510240786221) -->
+ <skip />
+ <!-- no translation found for broadcast_tile (3894036511763289383) -->
+ <skip />
+ <!-- no translation found for zen_alarm_warning_indef (3482966345578319605) -->
+ <skip />
+ <!-- no translation found for zen_alarm_warning (444533119582244293) -->
+ <skip />
+ <!-- no translation found for alarm_template (3980063409350522735) -->
+ <skip />
+ <!-- no translation found for alarm_template_far (4242179982586714810) -->
+ <skip />
+ <!-- no translation found for accessibility_quick_settings_detail (2579369091672902101) -->
+ <skip />
+ <!-- no translation found for accessibility_status_bar_hotspot (4099381329956402865) -->
+ <skip />
+ <!-- no translation found for accessibility_managed_profile (6613641363112584120) -->
+ <skip />
+ <!-- no translation found for tuner_warning_title (7094689930793031682) -->
+ <skip />
+ <!-- no translation found for tuner_warning (8730648121973575701) -->
+ <skip />
+ <!-- no translation found for tuner_persistent_warning (8597333795565621795) -->
+ <skip />
+ <!-- no translation found for got_it (2239653834387972602) -->
+ <skip />
+ <!-- no translation found for tuner_toast (603429811084428439) -->
+ <skip />
+ <!-- no translation found for remove_from_settings (8389591916603406378) -->
+ <skip />
+ <!-- no translation found for remove_from_settings_prompt (6069085993355887748) -->
+ <skip />
+ <!-- no translation found for activity_not_found (348423244327799974) -->
+ <skip />
+ <!-- no translation found for clock_seconds (7689554147579179507) -->
+ <skip />
+ <!-- no translation found for clock_seconds_desc (6282693067130470675) -->
+ <skip />
+ <!-- no translation found for qs_rearrange (8060918697551068765) -->
+ <skip />
+ <!-- no translation found for show_brightness (6613930842805942519) -->
+ <skip />
+ <!-- no translation found for experimental (6198182315536726162) -->
+ <skip />
+ <!-- no translation found for enable_bluetooth_title (5027037706500635269) -->
+ <skip />
+ <!-- no translation found for enable_bluetooth_message (9106595990708985385) -->
+ <skip />
+ <!-- no translation found for enable_bluetooth_confirmation_ok (6258074250948309715) -->
+ <skip />
+ <!-- no translation found for apply_to_topic (3641403489318659666) -->
+ <skip />
+ <!-- no translation found for apply_to_app (363016783939815960) -->
+ <skip />
+ <!-- no translation found for blocked_importance (5198578988978234161) -->
+ <skip />
+ <!-- no translation found for low_importance (4109929986107147930) -->
+ <skip />
+ <!-- no translation found for default_importance (8192107689995742653) -->
+ <skip />
+ <!-- no translation found for high_importance (1527066195614050263) -->
+ <skip />
+ <!-- no translation found for max_importance (5089005872719563894) -->
+ <skip />
+ <!-- no translation found for notification_importance_blocked (2397192642657872872) -->
+ <skip />
+ <!-- no translation found for notification_importance_low (4383563267370859725) -->
+ <skip />
+ <!-- no translation found for notification_importance_default (4926529615920610817) -->
+ <skip />
+ <!-- no translation found for notification_importance_high (3222680136612408223) -->
+ <skip />
+ <!-- no translation found for notification_importance_max (5236987171904756134) -->
+ <skip />
+ <!-- no translation found for notification_more_settings (816306283396553571) -->
+ <skip />
+ <!-- no translation found for notification_done (5279426047273930175) -->
+ <skip />
+ <!-- no translation found for color_matrix_none (2121957926040543148) -->
+ <skip />
+ <!-- no translation found for color_matrix_night (5943817622105307072) -->
+ <skip />
+ <!-- no translation found for color_matrix_custom (3655576492322298713) -->
+ <skip />
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automatski"</string>
+ <!-- no translation found for color_matrix_unknown (2709202104256265107) -->
+ <skip />
+ <!-- no translation found for color_transform (6985460408079086090) -->
+ <skip />
+ <!-- no translation found for color_matrix_show_qs (1763244354399276679) -->
+ <skip />
+ <!-- no translation found for color_enable_custom (6729001308217347501) -->
+ <skip />
+ <!-- no translation found for color_apply (9212602012641034283) -->
+ <skip />
+ <!-- no translation found for color_revert_title (4746666545480534663) -->
+ <skip />
+ <!-- no translation found for color_revert_message (9116001069397996691) -->
+ <skip />
+ <!-- no translation found for battery_panel_title (3476715163685592453) -->
+ <skip />
+ <!-- no translation found for battery_detail_charging_summary (1279095653533044008) -->
+ <skip />
+ <!-- no translation found for battery_detail_switch_title (6285872470260795421) -->
+ <skip />
+ <!-- no translation found for battery_detail_switch_summary (9049111149407626804) -->
+ <skip />
+ <!-- no translation found for keyboard_shortcut_group_system (6472647649616541064) -->
+ <skip />
+ <!-- no translation found for keyboard_shortcut_group_system_home (3054369431319891965) -->
+ <skip />
+ <!-- no translation found for keyboard_shortcut_group_system_recents (3154851905021926744) -->
+ <skip />
+ <!-- no translation found for keyboard_shortcut_group_system_back (2207004531216446378) -->
+ <skip />
+ <!-- no translation found for tuner_full_zen_title (5905081395132280054) -->
+ <skip />
+ <!-- no translation found for tuner_full_zen_summary (6883568374520596402) -->
+ <skip />
+ <!-- no translation found for volume_and_do_not_disturb (3114580364524650941) -->
+ <skip />
+ <!-- no translation found for volume_down_silent (66962568467719591) -->
+ <skip />
+ <!-- no translation found for volume_up_silent (7141255269783588286) -->
+ <skip />
+ <!-- no translation found for battery (7498329822413202973) -->
+ <skip />
+ <!-- no translation found for clock (7416090374234785905) -->
+ <skip />
+ <!-- no translation found for headset (4534219457597457353) -->
+ <skip />
+ <!-- no translation found for accessibility_status_bar_headphones (9156307120060559989) -->
+ <skip />
+ <!-- no translation found for accessibility_status_bar_headset (8666419213072449202) -->
+ <skip />
+ <!-- no translation found for tuner_status_bar_explanation (9032196769944137864) -->
+ <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Ušteda podataka"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Ušteda podataka je uključena"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Ušteda podataka je isključena"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Uključeno"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigaciona traka"</string>
+ <string name="start" msgid="6873794757232879664">"Početak"</string>
+ <string name="center" msgid="4327473927066010960">"Sredina"</string>
+ <string name="end" msgid="125797972524818282">"Kraj"</string>
+ <string name="space" msgid="804232271282109749">"Razmaknica"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Izbornik / Prebacivač tipkovn."</string>
+ <string name="select_button" msgid="1597989540662710653">"Odaberite gumb koji želite dodati"</string>
+ <string name="add_button" msgid="4134946063432258161">"Dodaj gumb"</string>
+ <string name="save" msgid="2311877285724540644">"Sačuvaj"</string>
+ <!-- no translation found for reset (2448168080964209908) -->
+ <skip />
+ <string name="no_home_title" msgid="1563808595146071549">"Gumb za početak nije pronađen."</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Gumb za početak je neophodan za navigaciju ovim uređajem. Dodajte gumb za početak prije pohranjivanja."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Podesite širinu gumba"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Međumemorija"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Međumorija omogućava direktno prebacivanje sadržaja u nju. Sadržaj se isto tako može povući direktno iz međumemorije ako ga ima."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Prilagođeni gumb za navigaciju"</string>
+ <string name="keycode" msgid="7335281375728356499">"Kod tipke"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Gumbovi za kodiranje tipki omogućavaju da se tipke sa tipkovnice dodaju u navigacionu traku. Kada se pritisnu, oni oponašaju izabranu tipku tastature. Kao prvo, tipka mora biti izabrana za dugme, a nakon toga se bira slika koja će biti prikazana na njemu."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Odaberite tipku na tastaturi"</string>
+ <string name="preview" msgid="9077832302472282938">"Pregledaj"</string>
+</resources>
diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml
index 714b750..c4dad9f 100644
--- a/packages/SystemUI/res/values-ca/strings.xml
+++ b/packages/SystemUI/res/values-ca/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Vora"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"No hi ha cap targeta SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Les dades mòbils estan desactivades"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Ancoratge de Bluetooth"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Mode d\'avió."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"No hi ha cap targeta SIM."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixació de pantalla"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"cerca"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"No s\'ha pogut iniciar <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Més"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> més"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Historial"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Esborra"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divisió horitzontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divisió vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divisió personalitzada"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Colors normals"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Colors nocturns"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Colors personalitzats"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automàtica"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Colors desconeguts"</string>
<string name="color_transform" msgid="6985460408079086090">"Modificació del color"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Mostra el mosaic de Configuració ràpida"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Auriculars connectats"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Auriculars connectats"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Activa o desactiva les icones a la barra d\'estat."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Economitzador de dades"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"L\'extensió Economitzador de dades està activada"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"L\'extensió Economitzador de dades està desactivada"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Activat"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Barra de navegació"</string>
+ <string name="start" msgid="6873794757232879664">"Inici"</string>
+ <string name="center" msgid="4327473927066010960">"Centre"</string>
+ <string name="end" msgid="125797972524818282">"Final"</string>
+ <string name="space" msgid="804232271282109749">"Separador"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menú / Commutador del teclat"</string>
+ <string name="select_button" msgid="1597989540662710653">"Tria un botó per afegir-lo"</string>
+ <string name="add_button" msgid="4134946063432258161">"Afegeix un botó"</string>
+ <string name="save" msgid="2311877285724540644">"Desa"</string>
+ <string name="reset" msgid="2448168080964209908">"Reinicia"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Cap botó de pàgina d\'inici"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Per poder navegar per aquest dispositiu, cal un botó de pàgina d\'inici. Afegeix-ne un abans de desar."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Ajusta l\'amplada del botó"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Porta-retalls"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Pots arrossegar elements al porta-retalls directament. Per treure\'n elements, també els pots arrossegar directament cap a fora."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Botó de navegació personalitzat"</string>
+ <string name="keycode" msgid="7335281375728356499">"Codi de tecla"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Amb els botons de codi de tecla es poden afegir tecles del teclat a la barra de navegació. En prémer aquests botons es duen a terme les mateixes accions que quan es prem la tecla corresponent. Primer cal seleccionar la tecla del botó i, a continuació, triar la imatge que es mostrarà."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Selecciona un botó de teclat"</string>
+ <string name="preview" msgid="9077832302472282938">"Previsualització"</string>
</resources>
diff --git a/packages/SystemUI/res/values-ca/strings_tv.xml b/packages/SystemUI/res/values-ca/strings_tv.xml
deleted file mode 100644
index 8daa867..0000000
--- a/packages/SystemUI/res/values-ca/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Tanca PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Pantalla completa"</string>
- <string name="pip_play" msgid="674145557658227044">"Reprodueix"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Posa en pausa"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Cancel·la"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Mantén premut el botó INICI per controlar PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml
index dcd42e0..e1d0d0e 100644
--- a/packages/SystemUI/res/values-cs/strings.xml
+++ b/packages/SystemUI/res/values-cs/strings.xml
@@ -148,6 +148,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Žádná SIM karta."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobilní data jsou vypnutá"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Sdílené připojení přes Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Režim Letadlo."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Není vložena SIM karta"</string>
@@ -302,8 +303,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"připnutí obrazovky"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"vyhledat"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Aplikaci <xliff:g id="APP">%s</xliff:g> nelze spustit."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Další"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"ještě <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Historie"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Vymazat"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Vodorovné rozdělení"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Vertikální rozdělení"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Vlastní rozdělení"</string>
@@ -469,6 +470,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Normální barvy"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Noční barvy"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Vlastní barvy"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automaticky"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Neznámé barvy"</string>
<string name="color_transform" msgid="6985460408079086090">"Změna barev"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Zobrazit dlaždici Rychlé nastavení"</string>
@@ -495,10 +497,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Sluchátka připojena"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Náhlavní souprava připojena"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Umožňuje aktivovat nebo deaktivovat zobrazení ikon na stavovém řádku."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Spořič dat"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Spořič dat je zapnutý"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Spořič dat je vypnutý"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Zapnuto"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigační panel"</string>
+ <string name="start" msgid="6873794757232879664">"Začátek"</string>
+ <string name="center" msgid="4327473927066010960">"Střed"</string>
+ <string name="end" msgid="125797972524818282">"Konec"</string>
+ <string name="space" msgid="804232271282109749">"Mezerník"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Přepínač nabídky/klávesnice"</string>
+ <string name="select_button" msgid="1597989540662710653">"Vyberte tlačítko"</string>
+ <string name="add_button" msgid="4134946063432258161">"Přidat tlačítko"</string>
+ <string name="save" msgid="2311877285724540644">"Uložit"</string>
+ <string name="reset" msgid="2448168080964209908">"Resetovat"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Nebylo nalezeno tlačítko plochy"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"K navigaci v zařízení je potřeba tlačítko plochy. Před uložením toto tlačítko přidejte."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Upravit šířku tlačítka"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Schránka"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Tlačítko Schránka umožňuje přetahovat položky přímo do schránky. Položky vložené do schránky lze také přetáhnout ven."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Vlastní navigační tlačítko"</string>
+ <string name="keycode" msgid="7335281375728356499">"Klávesa"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Tlačítka Klávesa umožňují přidat na navigační panel klávesy z klávesnice. Když na ně klepnete, budou emulovat vybranou klávesu. K tlačítku je nejprve nutné přiřadit klávesu a poté přidat obrázek tlačítka."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Vyberte klávesu na klávesnici"</string>
+ <string name="preview" msgid="9077832302472282938">"Náhled"</string>
</resources>
diff --git a/packages/SystemUI/res/values-cs/strings_tv.xml b/packages/SystemUI/res/values-cs/strings_tv.xml
deleted file mode 100644
index 8675c78..0000000
--- a/packages/SystemUI/res/values-cs/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Ukončit PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Celá obrazovka"</string>
- <string name="pip_play" msgid="674145557658227044">"Přehrát"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pozastavit"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Zrušit"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Chcete-li funkci PIP ovládat, podržte tlačítko PLOCHA"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml
index 835ce69..ce7db05 100644
--- a/packages/SystemUI/res/values-da/strings.xml
+++ b/packages/SystemUI/res/values-da/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Intet SIM-kort."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobildata er slået fra."</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth-netdeling."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Flytilstand."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Der er ikke noget SIM-kort."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"bliv i app"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"søg"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> kunne ikke startes."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Mere"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> mere"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Historik"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Ryd"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Opdel vandret"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Opdel lodret"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Opdel brugerdefineret"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Almindelige farver"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Nattefarver"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Tilpassede farver"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automatisk"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Ukendte farver"</string>
<string name="color_transform" msgid="6985460408079086090">"Farveændring"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Vis feltet Hurtige indstillinger"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Hovedtelefoner er tilsluttet"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Headset er forbundet"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Slå visning af ikoner i statusbjælken til eller fra."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Datasparefunktion"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Datasparefunktionen er slået til"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Datasparefunktionen er slået fra"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Til"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigationslinje"</string>
+ <string name="start" msgid="6873794757232879664">"Start"</string>
+ <string name="center" msgid="4327473927066010960">"I midten"</string>
+ <string name="end" msgid="125797972524818282">"For enden"</string>
+ <string name="space" msgid="804232271282109749">"Mellemrumstast"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menu/tastaturskifter"</string>
+ <string name="select_button" msgid="1597989540662710653">"Vælg den knap, du vil tilføje"</string>
+ <string name="add_button" msgid="4134946063432258161">"Tilføj knap"</string>
+ <string name="save" msgid="2311877285724540644">"Gem"</string>
+ <string name="reset" msgid="2448168080964209908">"Nulstil"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Ingen startknap blev fundet"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Du skal have en startknap for at kunne navigere rundt på denne enhed. Tilføj en startknap, før du gemmer."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Juster knappens bredde"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Udklipsholder"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Med Udklipsholder kan elementerne trækkes direkte til udklipsholderen. Elementerne kan også trækkes direkte ud af udklipsholderen, når den er åben."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Tilpasset navigationsknap"</string>
+ <string name="keycode" msgid="7335281375728356499">"Tastekode"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Tastekodeknapper gør det muligt at føje tastaturtaster til navigationslinjen. Når der trykkes på dem, efterligner de den valgte tastaturtast. Først vælges tasten til knappen, og derefter vælges det billede, der skal vises på knappen."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Vælg tastaturknap"</string>
+ <string name="preview" msgid="9077832302472282938">"Eksempelvisning"</string>
</resources>
diff --git a/packages/SystemUI/res/values-da/strings_tv.xml b/packages/SystemUI/res/values-da/strings_tv.xml
deleted file mode 100644
index a40e34c..0000000
--- a/packages/SystemUI/res/values-da/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Luk PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Fuld skærm"</string>
- <string name="pip_play" msgid="674145557658227044">"Afspil"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pause"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Annuller"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Hold HOME-knappen nede for at styre PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml
index 4888c23..1565521 100644
--- a/packages/SystemUI/res/values-de/strings.xml
+++ b/packages/SystemUI/res/values-de/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"WLAN"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Keine SIM-Karte"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobile Datennutzung deaktiviert"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth-Tethering"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Flugmodus"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Keine SIM-Karte"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"Bildschirmfixierung"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"Suche"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> konnte nicht gestartet werden."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Mehr"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> weitere"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Verlauf"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Löschen"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Geteilte Schaltfläche – horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Geteilte Schaltfläche – vertikal"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Geteilte Schaltfläche – benutzerdefiniert"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Standardfarben"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Nachtfarben"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Benutzerdefinierte Farben"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automatisch"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Unbekannte Farben"</string>
<string name="color_transform" msgid="6985460408079086090">"Farben ändern"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Kachel \"Schnelleinstellungen\" anzeigen"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Mit Kopfhörer verbunden"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Mit Headset verbunden"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Symbole in der Statusleiste ein- bzw. ausblenden"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Datenkomprimierung"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Datenkomprimierung aktiviert"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Datenkomprimierung deaktiviert"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"An"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigationsleiste"</string>
+ <string name="start" msgid="6873794757232879664">"Beim Start"</string>
+ <string name="center" msgid="4327473927066010960">"Mitte"</string>
+ <string name="end" msgid="125797972524818282">"Ende"</string>
+ <string name="space" msgid="804232271282109749">"Leerzeichen"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menü-/Tastaturwechsler"</string>
+ <string name="select_button" msgid="1597989540662710653">"Schaltfläche auswählen"</string>
+ <string name="add_button" msgid="4134946063432258161">"Schaltfläche hinzufügen"</string>
+ <string name="save" msgid="2311877285724540644">"Speichern"</string>
+ <string name="reset" msgid="2448168080964209908">"Zurücksetzen"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Startbildschirm-Schaltfläche fehlt"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Zur Bedienung dieses Geräts wird eine Schaltfläche für den Startbildschirm benötigt. Bitte füge vor dem Speichern eine entsprechende Schaltfläche hinzu."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Schaltflächenbreite anpassen"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Zwischenablage"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Elemente können direkt in die Zwischenablage gezogen werden. Ebenso können sie direkt aus der Zwischenablage gezogen werden, sofern diese geöffnet ist."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Benutzerdefinierte Navigationsschaltfläche"</string>
+ <string name="keycode" msgid="7335281375728356499">"Keycode"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Mit den Keycode-Schaltflächen können der Navigationsleiste Tasten hinzugefügt werden. Wird eine Keycode-Schaltfläche ausgewählt, führt sie die Aktion der entsprechenden Taste aus. Wählen Sie zuerst die Taste für die Schaltfläche aus und anschließend ein Bild, das auf der Schaltfläche erscheinen soll."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Taste auswählen"</string>
+ <string name="preview" msgid="9077832302472282938">"Vorschau"</string>
</resources>
diff --git a/packages/SystemUI/res/values-de/strings_tv.xml b/packages/SystemUI/res/values-de/strings_tv.xml
deleted file mode 100644
index 66e3e01..0000000
--- a/packages/SystemUI/res/values-de/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PiP schließen"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Vollbild"</string>
- <string name="pip_play" msgid="674145557658227044">"Wiedergeben"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pausieren"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Abbrechen"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Halte STARTSEITE gedrückt, um das PiP zu steuern."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml
index 882e5fa..5c31b86 100644
--- a/packages/SystemUI/res/values-el/strings.xml
+++ b/packages/SystemUI/res/values-el/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Δεν υπάρχει SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Τα δεδομένα κινητής τηλεφωνίας είναι απενεργοποιημένα"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Πρόσδεση Bluetooth"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Λειτουργία πτήσης."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Δεν υπάρχει κάρτα SIM."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"καρφίτσωμα οθόνης"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"αναζήτηση"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Δεν ήταν δυνατή η εκκίνηση της εφαρμογής <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Περισσότερα"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> ακόμα"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Ιστορικό"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Εκκαθάριση"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Οριζόντιος διαχωρισμός"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Κάθετος διαχωρισμός"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Προσαρμοσμένος διαχωρισμός"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Κανονικά χρώματα"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Νυχτερινά χρώματα"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Προσαρμοσμένα χρώματα"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Αυτόματο"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Άγνωστα χρώματα"</string>
<string name="color_transform" msgid="6985460408079086090">"Τροποποίηση χρωμάτων"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Εμφάνιση πλακιδίου Γρήγορων ρυθμίσεων"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Τα ακουστικά συνδέθηκαν"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Τα ακουστικά συνδέθηκαν"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Ενεργοποίηση ή απενεργοποίηση εμφάνιση εικονιδίων στη γραμμή κατάστασης."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Εξοικονόμηση δεδομένων"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Η Εξοικονόμηση δεδομένων είναι ενεργοποιημένη"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Η Εξοικονόμηση δεδομένων είναι απενεργοποιημένη"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Ενεργή"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Γραμμή πλοήγησης"</string>
+ <string name="start" msgid="6873794757232879664">"Έναρξη"</string>
+ <string name="center" msgid="4327473927066010960">"Κέντρο"</string>
+ <string name="end" msgid="125797972524818282">"Λήξη"</string>
+ <string name="space" msgid="804232271282109749">"Διαχωριστικό"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Εναλλαγή μενού/πληκτρολογίου"</string>
+ <string name="select_button" msgid="1597989540662710653">"Επιλογή κουμπιού για προσθήκη"</string>
+ <string name="add_button" msgid="4134946063432258161">"Προσθήκη κουμπιού"</string>
+ <string name="save" msgid="2311877285724540644">"Αποθήκευση"</string>
+ <string name="reset" msgid="2448168080964209908">"Επαναφορά"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Δεν βρέθηκε κουμπί αρχ. οθόνης"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Απαιτείται κουμπί αρχικής οθόνης για να είναι δυνατή η πλοήγηση σε αυτήν τη συσκευή. Προσθέστε ένα κουμπί αρχικής οθόνης πριν από την αποθήκευση."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Προσαρμογή πλάτους κουμπιού"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Πρόχειρο"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Το Πρόχειρο επιτρέπει να σύρετε στοιχεία απευθείας στο πρόχειρο. Μπορείτε, επίσης, να σύρετε στοιχεία από το πρόχειρο, όταν υπάρχουν στοιχεία σε αυτό."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Προσαρμοσμένο κουμπί πλοήγησης"</string>
+ <string name="keycode" msgid="7335281375728356499">"Κωδικός-πλήκτρο"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Τα κουμπιά κωδικού-πλήκτρου επιτρέπουν την προσθήκη πλήκτρου πληκτρολογίου στη γραμμή πλοήγησης. Όταν τα πατάτε, τα κουμπιά προσομοιώνουν το επιλεγμένη πλήκτρο πληκτρολογίου. Πρώτα πρέπει να επιλεγεί το πλήκτρο για το κουμπί. Στη συνέχεια, εμφανίζεται μια εικόνα στο κουμπί."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Επιλογή κουμπιού πληκτρολογίου"</string>
+ <string name="preview" msgid="9077832302472282938">"Προεπισκόπηση"</string>
</resources>
diff --git a/packages/SystemUI/res/values-el/strings_tv.xml b/packages/SystemUI/res/values-el/strings_tv.xml
deleted file mode 100644
index 7239386..0000000
--- a/packages/SystemUI/res/values-el/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Κλείσιμο PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Πλήρης οθόνη"</string>
- <string name="pip_play" msgid="674145557658227044">"Αναπαραγωγή"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Παύση"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Ακύρωση"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Κρατήστε το πλήκτρο HOME πατημένο για να ελέγξετε το PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml
index 6ded945..c2e1d58 100644
--- a/packages/SystemUI/res/values-en-rAU/strings.xml
+++ b/packages/SystemUI/res/values-en-rAU/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"No SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobile Data Off"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth tethering"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Aeroplane mode"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"No SIM card."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen pinning"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Could not start <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"More"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> More"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"History"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Clear"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Split Horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Split Vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Split Customised"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Normal colours"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Night colours"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Customised colours"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Auto"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Unknown colours"</string>
<string name="color_transform" msgid="6985460408079086090">"Colour modification"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Show Quick Settings tile"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Headphones connected"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Headset connected"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Enable or disable icons from being shown in the status bar."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Data Saver"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Data Saver is on"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Data Saver is off"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"On"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigation bar"</string>
+ <string name="start" msgid="6873794757232879664">"Start"</string>
+ <string name="center" msgid="4327473927066010960">"Centre"</string>
+ <string name="end" msgid="125797972524818282">"End"</string>
+ <string name="space" msgid="804232271282109749">"Spacer"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menu / Keyboard Switcher"</string>
+ <string name="select_button" msgid="1597989540662710653">"Select button to add"</string>
+ <string name="add_button" msgid="4134946063432258161">"Add button"</string>
+ <string name="save" msgid="2311877285724540644">"Savings"</string>
+ <string name="reset" msgid="2448168080964209908">"Reset"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"No home button found"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"A home button is required to be able to navigate this device. Please add a home button before saving."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Adjust button width"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Clipboard"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"The Clipboard allows items to be dragged directly to the clipboard. Items can also be dragged directly out of the clipboard when present."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Customised navigation button"</string>
+ <string name="keycode" msgid="7335281375728356499">"Keycode"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Keycode buttons allow keyboard keys to be added to the Navigation Bar. When pressed they emulate the selected keyboard key. First the key must be selected for the button, followed by an image to be shown on the button."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Select Keyboard Button"</string>
+ <string name="preview" msgid="9077832302472282938">"Preview"</string>
</resources>
diff --git a/packages/SystemUI/res/values-en-rAU/strings_tv.xml b/packages/SystemUI/res/values-en-rAU/strings_tv.xml
deleted file mode 100644
index 76576dd..0000000
--- a/packages/SystemUI/res/values-en-rAU/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Close PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Full screen"</string>
- <string name="pip_play" msgid="674145557658227044">"Play"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pause"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Cancel"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Hold HOME to control PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml
index 6ded945..c2e1d58 100644
--- a/packages/SystemUI/res/values-en-rGB/strings.xml
+++ b/packages/SystemUI/res/values-en-rGB/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"No SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobile Data Off"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth tethering"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Aeroplane mode"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"No SIM card."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen pinning"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Could not start <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"More"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> More"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"History"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Clear"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Split Horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Split Vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Split Customised"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Normal colours"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Night colours"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Customised colours"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Auto"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Unknown colours"</string>
<string name="color_transform" msgid="6985460408079086090">"Colour modification"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Show Quick Settings tile"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Headphones connected"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Headset connected"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Enable or disable icons from being shown in the status bar."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Data Saver"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Data Saver is on"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Data Saver is off"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"On"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigation bar"</string>
+ <string name="start" msgid="6873794757232879664">"Start"</string>
+ <string name="center" msgid="4327473927066010960">"Centre"</string>
+ <string name="end" msgid="125797972524818282">"End"</string>
+ <string name="space" msgid="804232271282109749">"Spacer"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menu / Keyboard Switcher"</string>
+ <string name="select_button" msgid="1597989540662710653">"Select button to add"</string>
+ <string name="add_button" msgid="4134946063432258161">"Add button"</string>
+ <string name="save" msgid="2311877285724540644">"Savings"</string>
+ <string name="reset" msgid="2448168080964209908">"Reset"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"No home button found"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"A home button is required to be able to navigate this device. Please add a home button before saving."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Adjust button width"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Clipboard"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"The Clipboard allows items to be dragged directly to the clipboard. Items can also be dragged directly out of the clipboard when present."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Customised navigation button"</string>
+ <string name="keycode" msgid="7335281375728356499">"Keycode"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Keycode buttons allow keyboard keys to be added to the Navigation Bar. When pressed they emulate the selected keyboard key. First the key must be selected for the button, followed by an image to be shown on the button."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Select Keyboard Button"</string>
+ <string name="preview" msgid="9077832302472282938">"Preview"</string>
</resources>
diff --git a/packages/SystemUI/res/values-en-rGB/strings_tv.xml b/packages/SystemUI/res/values-en-rGB/strings_tv.xml
deleted file mode 100644
index 76576dd..0000000
--- a/packages/SystemUI/res/values-en-rGB/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Close PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Full screen"</string>
- <string name="pip_play" msgid="674145557658227044">"Play"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pause"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Cancel"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Hold HOME to control PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml
index 6ded945..c2e1d58 100644
--- a/packages/SystemUI/res/values-en-rIN/strings.xml
+++ b/packages/SystemUI/res/values-en-rIN/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"No SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobile Data Off"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth tethering"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Aeroplane mode"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"No SIM card."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen pinning"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Could not start <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"More"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> More"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"History"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Clear"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Split Horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Split Vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Split Customised"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Normal colours"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Night colours"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Customised colours"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Auto"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Unknown colours"</string>
<string name="color_transform" msgid="6985460408079086090">"Colour modification"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Show Quick Settings tile"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Headphones connected"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Headset connected"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Enable or disable icons from being shown in the status bar."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Data Saver"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Data Saver is on"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Data Saver is off"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"On"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigation bar"</string>
+ <string name="start" msgid="6873794757232879664">"Start"</string>
+ <string name="center" msgid="4327473927066010960">"Centre"</string>
+ <string name="end" msgid="125797972524818282">"End"</string>
+ <string name="space" msgid="804232271282109749">"Spacer"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menu / Keyboard Switcher"</string>
+ <string name="select_button" msgid="1597989540662710653">"Select button to add"</string>
+ <string name="add_button" msgid="4134946063432258161">"Add button"</string>
+ <string name="save" msgid="2311877285724540644">"Savings"</string>
+ <string name="reset" msgid="2448168080964209908">"Reset"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"No home button found"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"A home button is required to be able to navigate this device. Please add a home button before saving."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Adjust button width"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Clipboard"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"The Clipboard allows items to be dragged directly to the clipboard. Items can also be dragged directly out of the clipboard when present."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Customised navigation button"</string>
+ <string name="keycode" msgid="7335281375728356499">"Keycode"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Keycode buttons allow keyboard keys to be added to the Navigation Bar. When pressed they emulate the selected keyboard key. First the key must be selected for the button, followed by an image to be shown on the button."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Select Keyboard Button"</string>
+ <string name="preview" msgid="9077832302472282938">"Preview"</string>
</resources>
diff --git a/packages/SystemUI/res/values-en-rIN/strings_tv.xml b/packages/SystemUI/res/values-en-rIN/strings_tv.xml
deleted file mode 100644
index 76576dd..0000000
--- a/packages/SystemUI/res/values-en-rIN/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Close PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Full screen"</string>
- <string name="pip_play" msgid="674145557658227044">"Play"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pause"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Cancel"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Hold HOME to control PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml
index 0cdb4c6..6318a29 100644
--- a/packages/SystemUI/res/values-es-rUS/strings.xml
+++ b/packages/SystemUI/res/values-es-rUS/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Sin tarjeta SIM"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Los datos móviles están desactivados"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Conexión mediante Bluetooth"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Modo avión"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Sin tarjeta SIM"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"Fijar pantalla"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"buscar"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"No se pudo iniciar <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Más"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> más"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Historial"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Borrar"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"División horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"División vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"División personalizada"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Colores normales"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Colores nocturnos"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Colores personalizados"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automático"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Colores desconocidos"</string>
<string name="color_transform" msgid="6985460408079086090">"Modificación del color"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Mostrar el mosaico de Configuración rápida"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Auriculares conectados"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Auriculares conectados"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Habilitar o inhabilitar la visualización de los íconos en la barra de estado"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Reducir datos"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Reducir datos está activada"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Reducir datos está desactivada"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Activado"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Barra de navegación"</string>
+ <string name="start" msgid="6873794757232879664">"Iniciar"</string>
+ <string name="center" msgid="4327473927066010960">"Centro"</string>
+ <string name="end" msgid="125797972524818282">"Finalizar"</string>
+ <string name="space" msgid="804232271282109749">"Separador"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menú/Cambio de teclado"</string>
+ <string name="select_button" msgid="1597989540662710653">"Elige un botón para agregar"</string>
+ <string name="add_button" msgid="4134946063432258161">"Agregar botón"</string>
+ <string name="save" msgid="2311877285724540644">"Guardar"</string>
+ <string name="reset" msgid="2448168080964209908">"Restablecer"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"No se encontró botón de inicio"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Se requiere un botón de inicio para navegar en este dispositivo. Agrega un botón de inicio antes de guardar el contenido."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Ajustar ancho del botón"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Portapapeles"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"El botón de Portapapeles permite arrastrar elementos directamente hacia el portapapeles, y fuera de él cuando estén presentes."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Botón de navegación personalizado"</string>
+ <string name="keycode" msgid="7335281375728356499">"Clave de código"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Los botones de las claves de código permiten agregar las teclas del teclado a la Barra de navegación. Al presionarlas, emulan la tecla seleccionada. Primero, debes elegir la tecla para el botón y, luego, asignarle una imagen."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Selecciona un botón del teclado"</string>
+ <string name="preview" msgid="9077832302472282938">"Vista previa"</string>
</resources>
diff --git a/packages/SystemUI/res/values-es-rUS/strings_tv.xml b/packages/SystemUI/res/values-es-rUS/strings_tv.xml
deleted file mode 100644
index 9b0a055..0000000
--- a/packages/SystemUI/res/values-es-rUS/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Cerrar PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Pantalla completa"</string>
- <string name="pip_play" msgid="674145557658227044">"Reproducir"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pausar"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Cancelar"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Mantén presionado el botón INICIO para controlar PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml
index cd5c95a..75370bd 100644
--- a/packages/SystemUI/res/values-es/strings.xml
+++ b/packages/SystemUI/res/values-es/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Tipo Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Sin tarjeta SIM"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Datos móviles desactivados"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Compartir por Bluetooth"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Modo avión"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"No hay tarjeta SIM."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fijación de pantalla"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"buscar"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"No se ha podido iniciar <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Más"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> más"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Historial"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Borrar"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"División horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"División vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"División personalizada"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Colores normales"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Colores nocturnos"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Colores personalizados"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automático"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Colores desconocidos"</string>
<string name="color_transform" msgid="6985460408079086090">"Modificación de colores"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Mostrar mosaico de Ajustes rápidos"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Auriculares conectados"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Auriculares conectados"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Permite mostrar u ocultar iconos en la barra de estado"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Economizador de datos"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Economizador de datos activado"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Economizador de datos desactivado"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Sí"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Barra de navegación"</string>
+ <string name="start" msgid="6873794757232879664">"Inicio"</string>
+ <string name="center" msgid="4327473927066010960">"Centro"</string>
+ <string name="end" msgid="125797972524818282">"Fin"</string>
+ <string name="space" msgid="804232271282109749">"Espacio"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menú/Cambio de teclado"</string>
+ <string name="select_button" msgid="1597989540662710653">"Selecciona botón para añadirlo"</string>
+ <string name="add_button" msgid="4134946063432258161">"Añadir botón"</string>
+ <string name="save" msgid="2311877285724540644">"Guardar"</string>
+ <string name="reset" msgid="2448168080964209908">"Restablecer"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Botón de inicio no encontrado"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Se necesita un botón de inicio para poder navegar por el dispositivo. Añádelo antes de guardar."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Ajustar el ancho del botón"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Portapapeles"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Con este botón puedes arrastrar los elementos directamente al portapapeles y, si está presente, fuera de él."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Botón de navegación personalizada"</string>
+ <string name="keycode" msgid="7335281375728356499">"Código de teclado"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Con los botones del código de teclado puedes añadir teclas a la barra de navegación que, al pulsarlas, emulan la tecla seleccionada. Primero debes seleccionar la tecla para el botón y, a continuación, la imagen que se va a mostrar en él."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Selecciona un botón de teclado"</string>
+ <string name="preview" msgid="9077832302472282938">"Vista previa"</string>
</resources>
diff --git a/packages/SystemUI/res/values-es/strings_tv.xml b/packages/SystemUI/res/values-es/strings_tv.xml
deleted file mode 100644
index b9649f9..0000000
--- a/packages/SystemUI/res/values-es/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Cerrar PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Pantalla completa"</string>
- <string name="pip_play" msgid="674145557658227044">"Reproducir"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pausar"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Cancelar"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Mantén pulsado el botón INICIO para controlar PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-et-rEE/strings.xml b/packages/SystemUI/res/values-et-rEE/strings.xml
index 52fc39e..2f22c64 100644
--- a/packages/SystemUI/res/values-et-rEE/strings.xml
+++ b/packages/SystemUI/res/values-et-rEE/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Serv"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"WiFi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"SIM-kaarti pole."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobiilne andmeside on välja lülitatud"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetoothi jagamine."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Lennurežiim."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"SIM-kaarti pole."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ekraanikuva kinnitamine"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"otsing"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Rakendust <xliff:g id="APP">%s</xliff:g> ei saanud käivitada."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Rohkem"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Veel <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Ajalugu"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Kustuta"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Horisontaalne poolitamine"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Vertikaalne poolitamine"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Kohandatud poolitamine"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Tavalised värvid"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Öised värvid"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Kohandatud värvid"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automaatne"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Värvid on teadmata"</string>
<string name="color_transform" msgid="6985460408079086090">"Värvi muutmine"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Kuva paan Kiirseaded"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Kõrvaklapid on ühendatud"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Peakomplekt on ühendatud"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Lubatakse või keelatakse ikoonide kuvamine olekuribal."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Andmemahu säästja"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Andmemahu säästja on sisse lülitatud"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Andmemahu säästja on välja lülitatud"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Sees"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigeerimisriba"</string>
+ <string name="start" msgid="6873794757232879664">"Algus"</string>
+ <string name="center" msgid="4327473927066010960">"Keskkoht"</string>
+ <string name="end" msgid="125797972524818282">"Lõpp"</string>
+ <string name="space" msgid="804232271282109749">"Tühik"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menüü / klaviatuuri vahetaja"</string>
+ <string name="select_button" msgid="1597989540662710653">"Lisatava nupu valimine"</string>
+ <string name="add_button" msgid="4134946063432258161">"Lisa nupp"</string>
+ <string name="save" msgid="2311877285724540644">"Salvesta"</string>
+ <string name="reset" msgid="2448168080964209908">"Lähtesta"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Avaekraani nuppu ei leitud"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Seadmes navigeerimiseks on vajalik avaekraani nupp. Lisage enne salvestamist avaekraani nupp."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Nupu laiuse reguleerimine"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Lõikelaud"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Lõikelaud võimaldab üksused lohistada otse lõikelauale. Kui üksused on lõikelaual, saab need sealt ka ära lohistada."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Kohandatud navigeerimisnupp"</string>
+ <string name="keycode" msgid="7335281375728356499">"Võtmekood"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Võtmekoodi nupud võimaldavad klaviatuuriklahvid lisada navigeerimisribale. Nupu vajutamisel jäljendavad need valitud klaviatuuriklahvi. Esmalt tuleb nupu jaoks valida klahv ja seejärel kujutis, mis nupul kuvada."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Klaviatuuri nupu valimine"</string>
+ <string name="preview" msgid="9077832302472282938">"Eelvaade"</string>
</resources>
diff --git a/packages/SystemUI/res/values-et-rEE/strings_tv.xml b/packages/SystemUI/res/values-et-rEE/strings_tv.xml
deleted file mode 100644
index 8af5984..0000000
--- a/packages/SystemUI/res/values-et-rEE/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Sule PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Täisekraan"</string>
- <string name="pip_play" msgid="674145557658227044">"Esita"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Peata"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Tühista"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP juhtimiseks hoidke all nuppu AVAEKRAAN"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-eu-rES/strings.xml b/packages/SystemUI/res/values-eu-rES/strings.xml
index 06a43f6..aa2c5be 100644
--- a/packages/SystemUI/res/values-eu-rES/strings.xml
+++ b/packages/SystemUI/res/values-eu-rES/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi konexioa"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Ez dago SIM txartelik."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Desaktibatuta dago datu-konexioa"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Konexioa partekatzea (Bluetooth)"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Hegaldi-modua"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Ez dago SIM txartelik."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pantaila-ainguratzea"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"bilatu"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Ezin izan da hasi <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Gehiago"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Beste <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Historia"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Garbitu"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Banaketa horizontala"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Banaketa bertikala"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Banaketa pertsonalizatua"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Kolore normalak"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Gaueko koloreak"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Kolore pertsonalizatuak"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automatikoa"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Kolore ezezagunak"</string>
<string name="color_transform" msgid="6985460408079086090">"Kolore-aldaketa"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Erakutsi ezarpen bizkorren lauza"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Aurikularrak konektatu dira"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Mikrofonodun entzungailua konektatu da"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Gaitu edo desgaitu ikonoak egoera-barran erakusteko aukera."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Datu-aurrezlea"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Aktibatuta dago datu-aurrezlea"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Desaktibatuta dago datu-aurrezlea"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Aktibatuta"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Nabigazio-barra"</string>
+ <string name="start" msgid="6873794757232879664">"Hasi"</string>
+ <string name="center" msgid="4327473927066010960">"Erdiratu"</string>
+ <string name="end" msgid="125797972524818282">"Amaitu"</string>
+ <string name="space" msgid="804232271282109749">"Bereizgailua"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menu- edo teklatu-aldatzailea"</string>
+ <string name="select_button" msgid="1597989540662710653">"Hautatu gehitu beharreko botoia"</string>
+ <string name="add_button" msgid="4134946063432258161">"Gehitu botoia"</string>
+ <string name="save" msgid="2311877285724540644">"Gorde"</string>
+ <string name="reset" msgid="2448168080964209908">"Berrezarri"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Ez da aurkitu hasiera-botoirik"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Hasiera-botoia behar da gailuan ibiltzeko. Gorde aurretik, gehi ezazu bat."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Doitu botoiaren zabalera"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Arbela"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Arbelari esker, elementuak arbelera zuzenean arrasta daitezke. Elementuak arbelean daudenean, handik zuzenean atera daitezke."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Nabigazio-botoi pertsonalizatua"</string>
+ <string name="keycode" msgid="7335281375728356499">"Tekla-kodea"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Tekla-kodeko botoiekin, teklatuko teklak gehi daitezke nabigazio-barran. Sakatzen direnean, hautatutako teklaren funtzioa gauzatzen dute. Lehendabizi, botoiaren tekla hautatu behar da eta, gero, botoian agertuko den irudia."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Hautatu teklatuko botoia"</string>
+ <string name="preview" msgid="9077832302472282938">"Aurrebista"</string>
</resources>
diff --git a/packages/SystemUI/res/values-eu-rES/strings_tv.xml b/packages/SystemUI/res/values-eu-rES/strings_tv.xml
deleted file mode 100644
index be2053e..0000000
--- a/packages/SystemUI/res/values-eu-rES/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Itxi pantaila txikia"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Pantaila osoa"</string>
- <string name="pip_play" msgid="674145557658227044">"Erreproduzitu"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pausatu"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Utzi"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Eduki sakatuta hasierako botoia pantaila txikia kontrolatzeko"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml
index 0af19ba..67f3fab 100644
--- a/packages/SystemUI/res/values-fa/strings.xml
+++ b/packages/SystemUI/res/values-fa/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"بدون سیم کارت."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"داده تلفن همراه خاموش است"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"اتصال اینترنت با بلوتوث تلفن همراه."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"حالت هواپیما."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"سیمکارتی موجود نیست."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"پین کردن صفحه"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"جستجو"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> شروع نشد."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"بیشتر"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> مورد دیگر"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"سابقه"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"پاک کردن"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"تقسیم افقی"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"تقسیم عمودی"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"سفارشی کردن تقسیم"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"رنگهای عادی"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"رنگهای شب"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"رنگهای سفارشی"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"خودکار"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"رنگهای نامشخص"</string>
<string name="color_transform" msgid="6985460408079086090">"اصلاح رنگ"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"نمایش کاشی تنظیمات سریع"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"هدفون وصل شد"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"هدست وصل شد"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"فعال یا غیرفعال کردن نمایش نمادها در نوار وضعیت."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"صرفهجویی در مصرف داده"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"صرفهجویی در مصرف داده روشن است"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"صرفهجویی در مصرف داده خاموش است"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"روشن"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"نوار پیمایش"</string>
+ <string name="start" msgid="6873794757232879664">"شروع"</string>
+ <string name="center" msgid="4327473927066010960">"وسط"</string>
+ <string name="end" msgid="125797972524818282">"پایان"</string>
+ <string name="space" msgid="804232271282109749">"جداکننده"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"جابهجاکننده منو / صفحهکلید"</string>
+ <string name="select_button" msgid="1597989540662710653">"دکمه را برای افزودن انتخاب کنید"</string>
+ <string name="add_button" msgid="4134946063432258161">"دکمه افزودن"</string>
+ <string name="save" msgid="2311877285724540644">"ذخیره کردن"</string>
+ <string name="reset" msgid="2448168080964209908">"بازنشانی"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"دکمه صفحه اصلیای پیدا نشد"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"برای پیمایش در این دستگاه به دکمه صفحه اصلی نیاز است. لطفاً قبل از ذخیره کردن، یک دکمه صفحه اصلی اضافه کنید."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"تنظیم پهنای دکمه"</string>
+ <string name="clipboard" msgid="1313879395099896312">"کلیپبورد"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"«کلیپبورد» امکان میدهد موارد بهطور مستقیم به کلیپبورد کشیده شوند. اگر مواردی در کلیپبورد وجود داشته باشند میتوانند بهطور مستقیم به خارج از آن نیز کشیده شوند."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"دکمه پیمایش سفارشی"</string>
+ <string name="keycode" msgid="7335281375728356499">"کد کلید"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"دکمه «کد دکمه» به کلیدهای صفحهکلید امکان میدهند به «نوار پیمایش» اضافه شوند. وقتی فشار داده میشوند رفتار کلید صفحهکلید انتخابشده را تقلید میکنند. ابتدا باید کلید را برای دکمه انتخاب کرد و به دنبال آن باید تصویری برای نشان داده شدن روی دکمه انتخاب شود."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"کلید صفحهکلید را انتخاب کنید"</string>
+ <string name="preview" msgid="9077832302472282938">"پیشنمایش"</string>
</resources>
diff --git a/packages/SystemUI/res/values-fa/strings_tv.xml b/packages/SystemUI/res/values-fa/strings_tv.xml
deleted file mode 100644
index b7c4e61..0000000
--- a/packages/SystemUI/res/values-fa/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"بستن PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"تمام صفحه"</string>
- <string name="pip_play" msgid="674145557658227044">"پخش"</string>
- <string name="pip_pause" msgid="8412075640017218862">"مکث"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"لغو"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"نگهداشتن HOME برای کنترل PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml
index 327e1df..6e3d740 100644
--- a/packages/SystemUI/res/values-fi/strings.xml
+++ b/packages/SystemUI/res/values-fi/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Ei SIM-korttia."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobiilidata pois päältä"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Internetin jakaminen Bluetoothin kautta."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Lentokonetila."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Ei SIM-korttia."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"näytön kiinnitys"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"haku"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Sovelluksen <xliff:g id="APP">%s</xliff:g> käynnistäminen epäonnistui."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Lisää"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"+<xliff:g id="NUMBER">%d</xliff:g> lisää"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Historia"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Tyhjennä"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Vaakasuuntainen jako"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Pystysuuntainen jako"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Muokattu jako"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Tavalliset värit"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Yövärit"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Muokatut värit"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automaattinen"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Tuntemattomat värit"</string>
<string name="color_transform" msgid="6985460408079086090">"Muokatut värit"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Näytä pika-asetusruutu"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Kuulokkeet liitetty"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Kuulokemikrofoni liitetty"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Ota tilapalkin kuvakkeet käyttöön tai poista ne käytöstä."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Data Saver"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Data Saver on käytössä."</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Data Saver on pois käytöstä."</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Käytössä"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigointipalkki"</string>
+ <string name="start" msgid="6873794757232879664">"Alussa"</string>
+ <string name="center" msgid="4327473927066010960">"Keskellä"</string>
+ <string name="end" msgid="125797972524818282">"Lopussa"</string>
+ <string name="space" msgid="804232271282109749">"Tyhjä väli"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Valikko/Näppäimistövalitsin"</string>
+ <string name="select_button" msgid="1597989540662710653">"Valitse lisättävä painike"</string>
+ <string name="add_button" msgid="4134946063432258161">"Lisää painike"</string>
+ <string name="save" msgid="2311877285724540644">"Tallenna"</string>
+ <string name="reset" msgid="2448168080964209908">"Palauta"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Ei aloitusnäyttöpainiketta"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Laitteessa navigointi edellyttää aloitusnäyttöpainiketta. Lisää aloitusnäyttöpainike ennen tallentamista."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Muokkaa painikkeen leveyttä"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Leikepöytä"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Leikepöytä sallii kohteiden vetämisen suoraan leikepöydälle. Kohteet voi vetää myös suoraan pois leikepöydältä, kun se on käytössä."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Muokattu navigointipainike"</string>
+ <string name="keycode" msgid="7335281375728356499">"Näppäinkoodi"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Näppäinkoodi-painikkeet sallivat näppäimistön näppäimien lisäämisen navigointipalkkiin. Kun painiketta painetaan, se jäljittelee valittua näppäintä. Valitse ensin painikkeen kohteena oleva näppäin, sitten painikkeessa näkyvä kuva."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Valitse näppäimistön näppäin"</string>
+ <string name="preview" msgid="9077832302472282938">"Esikatselu"</string>
</resources>
diff --git a/packages/SystemUI/res/values-fi/strings_tv.xml b/packages/SystemUI/res/values-fi/strings_tv.xml
deleted file mode 100644
index d39c37f..0000000
--- a/packages/SystemUI/res/values-fi/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Sulje PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Koko näyttö"</string>
- <string name="pip_play" msgid="674145557658227044">"Toista"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Keskeytä"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Peruuta"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Hallinnoi PIP-tilaa painamalla Aloitusnäyttö-painiketta pitkään."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml
index 7ebb5ab..d85662d 100644
--- a/packages/SystemUI/res/values-fr-rCA/strings.xml
+++ b/packages/SystemUI/res/values-fr-rCA/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Aucune carte SIM"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Données cellulaires déésactivées"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Partage de connexion Bluetooth"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Mode Avion"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Aucune carte SIM."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"épinglage d\'écran"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"rechercher"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Impossible de lancer <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Plus"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> autres"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Historique"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Effacer"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Séparation horizontale"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Séparation verticale"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Séparation personnalisée"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Couleurs normales"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Couleurs nocturnes"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Couleurs personnalisées"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automatique"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Couleurs inconnues"</string>
<string name="color_transform" msgid="6985460408079086090">"Modifier la couleur"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Afficher la tuile de configuration rapide"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Écouteurs connectés"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Écouteurs connectés"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Activer ou désactiver l\'affichage des icônes dans la barre d\'état"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Économiseur de données"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"La fonction Économiseur de données est activée"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"La fonction Économiseur de données est désactivée"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Activé"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Barre de navigation"</string>
+ <string name="start" msgid="6873794757232879664">"Démarrer"</string>
+ <string name="center" msgid="4327473927066010960">"Centrer"</string>
+ <string name="end" msgid="125797972524818282">"Fin"</string>
+ <string name="space" msgid="804232271282109749">"Espace"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Sélecteur menu/clavier"</string>
+ <string name="select_button" msgid="1597989540662710653">"Sélectionnez le bouton à ajouter"</string>
+ <string name="add_button" msgid="4134946063432258161">"Ajouter un bouton"</string>
+ <string name="save" msgid="2311877285724540644">"Enregistrer"</string>
+ <string name="reset" msgid="2448168080964209908">"Réinitialiser"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Aucune touche d\'accueil"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Une touche d\'accueil est nécessaire pour naviguer sur cet appareil. Veuillez ajouter une touche d\'accueil avant d\'enregistrer."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Ajuster la largeur du bouton"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Presse-papiers"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Vous pouvez faire glisser des éléments directement dans le presse-papiers, et inversement."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Bouton de navigation personnalisé"</string>
+ <string name="keycode" msgid="7335281375728356499">"Code de touche"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Les boutons de codes de touche permettent d\'ajouter des touches du clavier à la barre de navigation. Lorsque vous appuyez sur l\'un de ces boutons, il reproduit la fonction du clavier correspondante. Vous devez d\'abord sélectionner la touche pour le bouton, puis l\'image à afficher sur celui-ci."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Sélectionnez la touche du clavier"</string>
+ <string name="preview" msgid="9077832302472282938">"Aperçu"</string>
</resources>
diff --git a/packages/SystemUI/res/values-fr-rCA/strings_car.xml b/packages/SystemUI/res/values-fr-rCA/strings_car.xml
index 209773b..10e1fd5 100644
--- a/packages/SystemUI/res/values-fr-rCA/strings_car.xml
+++ b/packages/SystemUI/res/values-fr-rCA/strings_car.xml
@@ -19,6 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_lockscreen_disclaimer_title" msgid="7997539137376896441">"Conduire en toute sécurité"</string>
+ <string name="car_lockscreen_disclaimer_title" msgid="7997539137376896441">"Conduisez prudemment"</string>
<string name="car_lockscreen_disclaimer_text" msgid="3061224684092952864">"Tenez compte des conditions de la route et respectez toujours les lois en vigueur. Les itinéraires peuvent être incorrects, incomplets, dangereux, inappropriés ou interdits, et ils peuvent traverser des zones administratives. Les renseignements sur les entreprises peuvent également être incorrects ou incomplets. Les données ne sont pas fournies en temps réel, et la précision de la localisation n\'est pas garantie. Ne manipulez pas votre appareil mobile et n\'utilisez pas d\'applications non conçues pour Android Auto lorsque vous conduisez."</string>
</resources>
diff --git a/packages/SystemUI/res/values-fr-rCA/strings_tv.xml b/packages/SystemUI/res/values-fr-rCA/strings_tv.xml
deleted file mode 100644
index c06e492..0000000
--- a/packages/SystemUI/res/values-fr-rCA/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Fermer le mode PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Plein écran"</string>
- <string name="pip_play" msgid="674145557658227044">"Lecture"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Interrompre"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Annuler"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Maintenez enfoncée la touche ACCUEIL gérer le mode PIP."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml
index d16f680..a60b498 100644
--- a/packages/SystemUI/res/values-fr/strings.xml
+++ b/packages/SystemUI/res/values-fr/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Aucune carte SIM"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Données mobiles désactivées"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Partage de connexion Bluetooth"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Mode Avion"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Aucune carte SIM"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"épinglage d\'écran"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"rechercher"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Impossible de lancer <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Plus"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> autres"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Historique"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Effacer"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Séparation horizontale"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Séparation verticale"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Séparation personnalisée"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Couleurs normales"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Couleurs nocturnes"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Couleurs personnalisées"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automatique"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Couleurs inconnues"</string>
<string name="color_transform" msgid="6985460408079086090">"Modification des couleurs"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Afficher la tuile de configuration rapide"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Casque connecté"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Casque connecté"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Activer ou désactiver l\'affichage des icônes dans la barre d\'état"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Économiseur de données"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"L\'économiseur de données est activé."</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"L\'économiseur de données est désactivé."</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Activé"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Barre de navigation"</string>
+ <string name="start" msgid="6873794757232879664">"Début"</string>
+ <string name="center" msgid="4327473927066010960">"Centre"</string>
+ <string name="end" msgid="125797972524818282">"Fin"</string>
+ <string name="space" msgid="804232271282109749">"Espace"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Sélecteur menu/clavier"</string>
+ <string name="select_button" msgid="1597989540662710653">"Sélectionner le bouton à ajouter"</string>
+ <string name="add_button" msgid="4134946063432258161">"Ajouter un bouton"</string>
+ <string name="save" msgid="2311877285724540644">"Enregistrer"</string>
+ <string name="reset" msgid="2448168080964209908">"Réinitialiser"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Aucun bouton d\'accueil trouvé"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Un bouton d\'accueil est nécessaire pour naviguer sur cet appareil. Veuillez ajouter un bouton d\'accueil avant d\'enregistrer."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Ajuster la largeur du bouton"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Presse-papiers"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Vous pouvez faire glisser des éléments directement dans le Presse-papiers et inversement."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Bouton de navigation personnalisé"</string>
+ <string name="keycode" msgid="7335281375728356499">"Code touche"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Les boutons de codes touche permettent d\'ajouter des touches du clavier à la barre de navigation. Lorsque vous appuyez sur l\'un de ces boutons, il reproduit la fonction de la touche du clavier correspondante. Vous devez d\'abord sélectionner la touche pour le bouton, puis l\'image à afficher sur celui-ci."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Sélectionner la touche du clavier"</string>
+ <string name="preview" msgid="9077832302472282938">"Aperçu"</string>
</resources>
diff --git a/packages/SystemUI/res/values-fr/strings_tv.xml b/packages/SystemUI/res/values-fr/strings_tv.xml
deleted file mode 100644
index bf7306e..0000000
--- a/packages/SystemUI/res/values-fr/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Fermer le mode PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Plein écran"</string>
- <string name="pip_play" msgid="674145557658227044">"Lire"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Suspendre"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Annuler"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Appuyez de manière prolongée sur \"ACCUEIL\" pour contrôler le mode PIP."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-gl-rES/strings.xml b/packages/SystemUI/res/values-gl-rES/strings.xml
index fad6b43..831228e 100644
--- a/packages/SystemUI/res/values-gl-rES/strings.xml
+++ b/packages/SystemUI/res/values-gl-rES/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Sen SIM"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Os datos móbiles están desactivados"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Ancoraxe de Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Modo avión"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Non hai tarxeta SIM"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixación de pantalla"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"buscar"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Non foi posible iniciar <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Máis"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> máis"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Historial"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Borrar"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Dividir en horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Dividir en vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Dividir de xeito personalizado"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Cores normais"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Cores nocturnas"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Cores personalizadas"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automático"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Cores descoñecidas"</string>
<string name="color_transform" msgid="6985460408079086090">"Modificación de cor"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Mostrar mosaico de configuración rápida"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Conectáronse os auriculares"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Conectáronse os auriculares"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Activa ou desactiva a visualización das iconas na barra de estado."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Economizador de datos"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"O economizador de datos está activado"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"O economizador de datos está desactivado"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Activar"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Barra de navegación"</string>
+ <string name="start" msgid="6873794757232879664">"Inicio"</string>
+ <string name="center" msgid="4327473927066010960">"Centro"</string>
+ <string name="end" msgid="125797972524818282">"Fin"</string>
+ <string name="space" msgid="804232271282109749">"Barra espazadora"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Conmutador menú/teclado"</string>
+ <string name="select_button" msgid="1597989540662710653">"Selecciona o botón a engadir"</string>
+ <string name="add_button" msgid="4134946063432258161">"Engadir botón"</string>
+ <string name="save" msgid="2311877285724540644">"Gardar"</string>
+ <string name="reset" msgid="2448168080964209908">"Restablecer"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Botón de inicio non encontrado"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Necesítase un botón de inicio para navegar neste dispositivo. Engade un botón de inicio antes da acción de gardar."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Axustar o ancho do botón"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Portapapeis"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Pódense arrastrar elementos directamente ao portapapeis. Tamén se poden arrastrar directamente fóra del."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Botón de navegación personalizada"</string>
+ <string name="keycode" msgid="7335281375728356499">"Código de teclas"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Os botóns de código de teclas permiten engadir teclas do teclado á barra de navegación. Ao premelos, emulan a tecla seleccionada. Primeiro, debes seleccionar unha tecla para o botón e escoller a imaxe que se mostrará nel."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Selecciona o botón do teclado"</string>
+ <string name="preview" msgid="9077832302472282938">"Vista previa"</string>
</resources>
diff --git a/packages/SystemUI/res/values-gl-rES/strings_tv.xml b/packages/SystemUI/res/values-gl-rES/strings_tv.xml
deleted file mode 100644
index 857911d..0000000
--- a/packages/SystemUI/res/values-gl-rES/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Pechar PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Pantalla completa"</string>
- <string name="pip_play" msgid="674145557658227044">"Reproducir"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pausar"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Cancelar"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Manter premido INICIO para controlar PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-gu-rIN/strings.xml b/packages/SystemUI/res/values-gu-rIN/strings.xml
index 576c332..20d48a4 100644
--- a/packages/SystemUI/res/values-gu-rIN/strings.xml
+++ b/packages/SystemUI/res/values-gu-rIN/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"SIM નથી."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"સેલ્યુલર ડેટા બંધ છે"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth ટિથરિંગ."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"એરપ્લેન મોડ."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"કોઇ SIM કાર્ડ નથી."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"સ્ક્રીન પિનિંગ"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"શોધ"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> પ્રારંભ કરી શકાયું નથી."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"વધુ"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> વધુ"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"ઇતિહાસ"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"સાફ કરો"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"આડું વિભક્ત કરો"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ઊભું વિભક્ત કરો"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"કસ્ટમ વિભક્ત કરો"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"સામાન્ય રંગો"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"રાત્રિ રંગો"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"કસ્ટમ રંગો"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"સ્વતઃ"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"અજાણ્યા રંગો"</string>
<string name="color_transform" msgid="6985460408079086090">"રંગ સંશોધન"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"ઝડપી સેટિંગ્સ ટાઇલ બતાવો"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"હેડફોન કનેક્ટ કર્યાં"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"હેડસેટ કનેક્ટ કર્યો"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"સ્થિતિ બારમાં બતાવવામાં આવતા આઇકન્સને સક્ષમ અથવા અક્ષમ કરો."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"ડેટા સેવર"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"ડેટા સેવર ચાલુ છે"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"ડેટા સેવર બંધ છે"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"ચાલુ"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"નેવિગેશન બાર"</string>
+ <string name="start" msgid="6873794757232879664">"પ્રારંભ કરો"</string>
+ <string name="center" msgid="4327473927066010960">"મધ્ય"</string>
+ <string name="end" msgid="125797972524818282">"સમાપ્ત"</string>
+ <string name="space" msgid="804232271282109749">"સ્પેસર"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"મેનૂ / કીબોર્ડ સ્વિચર"</string>
+ <string name="select_button" msgid="1597989540662710653">"ઉમેરવા માટે બટન પસંદ કરો"</string>
+ <string name="add_button" msgid="4134946063432258161">"બટન ઉમેરો"</string>
+ <string name="save" msgid="2311877285724540644">"સાચવો"</string>
+ <string name="reset" msgid="2448168080964209908">"ફરીથી સેટ કરો"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"કોઈ હોમ બટન મળ્યું નથી"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"આ ઉપકરણને નેવિગેટ કરવા માટે હોમ બટન આવશ્યક. કૃપા કરીને સાચવતાં પહેલાં એક હોમ બટન ઉમેરો."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"બટનની પહોળાઈ સમાયોજિત કરો"</string>
+ <string name="clipboard" msgid="1313879395099896312">"ક્લિપબોર્ડ"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"ક્લિપબોર્ડ આઇટમ્સને સીધા જ ક્લિપબોર્ડ પર ખેંચવાની મંજૂરી આપે છે. જ્યારે હાજર હોય ત્યારે આઇટમ્સ ક્લિપબોર્ડ પરથી સીધી જ બહાર પણ ખેંચી શકાય છે."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"કસ્ટમ નેવિગેશન બટન"</string>
+ <string name="keycode" msgid="7335281375728356499">"કીકોડ"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"કીકોડ બટન કીબોર્ડની કીઝને નેવિગેશન બારમાં ઉમેરવાની મંજૂરી આપે છે. જ્યારે દબાવવામાં આવે ત્યારે તે પસંદ કરેલ કીબોર્ડની કીનું અનુસરણ કરે છે. બટન માટે પહેલા કીબોર્ડની કીઝને પસંદ કરવી આવશ્યક છે, તે પછી બટન પર બતાવવામાં આવેલ છબી પસંદ કરવી આવશ્યક છે."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"કીબોર્ડ બટન પસંદ કરો"</string>
+ <string name="preview" msgid="9077832302472282938">"પૂર્વાવલોકન કરો"</string>
</resources>
diff --git a/packages/SystemUI/res/values-gu-rIN/strings_tv.xml b/packages/SystemUI/res/values-gu-rIN/strings_tv.xml
deleted file mode 100644
index fbb9a4f..0000000
--- a/packages/SystemUI/res/values-gu-rIN/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP બંધ કરો"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"પૂર્ણ સ્ક્રીન"</string>
- <string name="pip_play" msgid="674145557658227044">"ચલાવો"</string>
- <string name="pip_pause" msgid="8412075640017218862">"થોભાવો"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"રદ કરો"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP નિયંત્રિત કરવા માટે હોમ પકડી રાખો"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml
index 5d97aa6..25356c8 100644
--- a/packages/SystemUI/res/values-hi/strings.xml
+++ b/packages/SystemUI/res/values-hi/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"किनारा"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"वाई-फ़ाई"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"कोई सिम नहीं."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"सेल्युलर डेटा बंद है"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"ब्लूटूथ टेदरिंग."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"हवाई जहाज मोड."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"कोई सिम कार्ड नहीं है."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"स्क्रीन पिन करना"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"खोज"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> प्रारंभ नहीं किया जा सका."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"अधिक"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> अधिक"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"इतिहास"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"साफ़ करें"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"क्षैतिज रूप से विभाजित करें"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"लम्बवत रूप से विभाजित करें"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"कस्टम रूप से विभाजित करें"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"सामान्य रंग"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"रात्रि के रंग"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"कस्टम रंग"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"स्वतः"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"अज्ञात रंग"</string>
<string name="color_transform" msgid="6985460408079086090">"रंग परिवर्तन"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"त्वरित-सेटिंग टाइल दिखाएं"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"हेडफ़ोन कनेक्ट किए गए"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"हैडसेट कनेक्ट किया गया"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"आइकन को स्थिति बार में दिखाए जाने से सक्षम या अक्षम करें."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"डेटा बचतकर्ता"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"डेटा बचतकर्ता चालू है"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"डेटा बचतकर्ता बंद है"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"चालू"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"नेविगेशन बार"</string>
+ <string name="start" msgid="6873794757232879664">"प्रारंभ करें"</string>
+ <string name="center" msgid="4327473927066010960">"मध्य"</string>
+ <string name="end" msgid="125797972524818282">"समाप्त"</string>
+ <string name="space" msgid="804232271282109749">"स्पेसर"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"मेनू / कीबोर्ड स्विचर"</string>
+ <string name="select_button" msgid="1597989540662710653">"जोड़ने के लिए बटन चुनें"</string>
+ <string name="add_button" msgid="4134946063432258161">"बटन जोड़ें"</string>
+ <string name="save" msgid="2311877285724540644">"सहेजें"</string>
+ <string name="reset" msgid="2448168080964209908">"रीसेट करें"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"कोई होम बटन नहीं मिला"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"इस डिवाइस को नेविगट करने के लिए होम बटन आवश्यक है. कृपया सहेजने के पहले होम बटन जोड़ें."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"बटन की चौड़ाई समायोजित करें"</string>
+ <string name="clipboard" msgid="1313879395099896312">"क्लिपबोर्ड"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"क्लिपबोर्ड आइटम सीधे क्लिपबोर्ड में खींचने देता है. मौजूद होने पर आइटम क्लिपबोर्ड से सीधे बाहर भी खींचे जा सकते हैं."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"कस्टम मार्गदर्शक बटन"</string>
+ <string name="keycode" msgid="7335281375728356499">"कुंजी कोड"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"कुंजी कोड बटन कीबोर्ड कुंजियों को मार्गदर्शक बार में जोड़ने देती हैं. दबाए जाने पर वे चयनित कीबोर्ड कुंजी का अनुकरण करते हैं. सबसे पहले, बटन के लिए कुंजी का चयन करना चाहिए, उसके बाद बटन पर दिखाए जाने वाले चित्र का चयन करना चाहिए."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"कीबोर्ड बटन चुनें"</string>
+ <string name="preview" msgid="9077832302472282938">"पूर्वावलोकन"</string>
</resources>
diff --git a/packages/SystemUI/res/values-hi/strings_tv.xml b/packages/SystemUI/res/values-hi/strings_tv.xml
deleted file mode 100644
index 780725d..0000000
--- a/packages/SystemUI/res/values-hi/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP बंद करें"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"पूर्ण स्क्रीन"</string>
- <string name="pip_play" msgid="674145557658227044">"चलाएं"</string>
- <string name="pip_pause" msgid="8412075640017218862">"रोकें"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"अभी नहीं"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP को नियंत्रित करने के लिए होम पर रुकें"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml
index d96c308..746ae26 100644
--- a/packages/SystemUI/res/values-hr/strings.xml
+++ b/packages/SystemUI/res/values-hr/strings.xml
@@ -147,6 +147,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Nema SIM kartice."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobilni podaci isključeni"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Posredno povezivanje Bluetootha."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Način rada u zrakoplovu"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Nema SIM kartice."</string>
@@ -301,8 +302,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"prikvačivanje zaslona"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"pretraži"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Aplikacija <xliff:g id="APP">%s</xliff:g> nije pokrenuta."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Više"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Još <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Povijest"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Izbriši"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Podijeli vodoravno"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Podijeli okomito"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Podijeli prilagođeno"</string>
@@ -468,6 +469,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Uobičajene boje"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Noćne boje"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Prilagođene boje"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automatski"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Nepoznate boje"</string>
<string name="color_transform" msgid="6985460408079086090">"Izmjena boja"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Prikaži pločicu s brzim postavkama"</string>
@@ -494,10 +496,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Slušalice su povezane"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Slušalice su povezane"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Omogućuje ili onemogućuje prikazivanje ikona na traci statusa."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Ušteda podataka"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Ušteda podataka je uključena"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Ušteda podataka je isključena"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Uključeno"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigacijska traka"</string>
+ <string name="start" msgid="6873794757232879664">"Početak"</string>
+ <string name="center" msgid="4327473927066010960">"Sredina"</string>
+ <string name="end" msgid="125797972524818282">"Kraj"</string>
+ <string name="space" msgid="804232271282109749">"Razmak"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Izmjena izbornika/tipkovnice"</string>
+ <string name="select_button" msgid="1597989540662710653">"Odaberite gumb za dodavanje"</string>
+ <string name="add_button" msgid="4134946063432258161">"Dodaj gumb"</string>
+ <string name="save" msgid="2311877285724540644">"Spremi"</string>
+ <string name="reset" msgid="2448168080964209908">"Ponovo postavi"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Nema gumba početnog zaslona"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Da biste se mogli kretati ovim uređajem, potreban je gumb početnog zaslona. Dodajte gumb početnog zaslona prije spremanja."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Prilagodite širinu gumba"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Međuspremnik"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Međuspremnik omogućuje povlačenje stavki izravno u međuspremnik. Stavke se mogu i izravno povlačiti iz međuspremnika ako se nalaze u njemu."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Prilagođeni navigacijski gumb"</string>
+ <string name="keycode" msgid="7335281375728356499">"Kôd tipke"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Gumbi koda tipke omogućuju dodavanje tipki tipkovnice na navigacijsku traku. Kada ih se pritisne, oni emuliraju odabranu tipku tipkovnice. Prvo se mora odabrati tipka za gumb, a nakon toga na gumbu će se pojaviti slika."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Odaberite gumb tipkovnice"</string>
+ <string name="preview" msgid="9077832302472282938">"Pregled"</string>
</resources>
diff --git a/packages/SystemUI/res/values-hr/strings_tv.xml b/packages/SystemUI/res/values-hr/strings_tv.xml
deleted file mode 100644
index e87d880..0000000
--- a/packages/SystemUI/res/values-hr/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Zatvori PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Cijeli zaslon"</string>
- <string name="pip_play" msgid="674145557658227044">"Reproduciraj"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pauziraj"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Odustani"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Držite POČETNI ZASLON da biste kontrolirali PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml
index 0f4c31b..929150b 100644
--- a/packages/SystemUI/res/values-hu/strings.xml
+++ b/packages/SystemUI/res/values-hu/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Nincs SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobiladat-kapcsolat kikapcsolva"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth megosztása."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Repülőgép üzemmód."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Nincs SIM kártya."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"képernyő rögzítése"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"keresés"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Nem lehet elindítani a következőt: <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Továbbiak"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> további"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Előzmények"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Törlés"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Osztott vízszintes"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Osztott függőleges"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Osztott egyéni"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Hagyományos színek"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Esti színek"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Egyéni színek"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automatikus"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Ismeretlen színek"</string>
<string name="color_transform" msgid="6985460408079086090">"Színmódosítás"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Gyorsbeállítások mozaikjának megjelenítése"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Fejhallgató csatlakoztatva"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Headset csatlakoztatva"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Ikonok megjelenítése és elrejtése az állapotsoron."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Adatforgalom-csökkentő"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Az adatforgalom-csökkentő be van kapcsolva"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Az Adatforgalom-csökkentő ki van kapcsolva"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Be"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigációs sáv"</string>
+ <string name="start" msgid="6873794757232879664">"Kezdés"</string>
+ <string name="center" msgid="4327473927066010960">"Igazítás középre"</string>
+ <string name="end" msgid="125797972524818282">"Vége"</string>
+ <string name="space" msgid="804232271282109749">"Távtartó"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menü/Billentyűzetváltó"</string>
+ <string name="select_button" msgid="1597989540662710653">"Gomb kiválasztása hozzáadáshoz"</string>
+ <string name="add_button" msgid="4134946063432258161">"Gomb hozzáadása"</string>
+ <string name="save" msgid="2311877285724540644">"Mentés"</string>
+ <string name="reset" msgid="2448168080964209908">"Alaphelyzet"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Nem található főoldal gomb"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Az eszközön történő navigáláshoz főoldal gomb szükséges. Kérjük, a mentés előtt adjon hozzá egy főoldal gombot."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Gombszélesség beállítása"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Vágólap"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"A Vágólap lehetővé teszi az elemek áthúzását közvetlenül a vágólapra. Ha vannak elemek a vágólapon, közvetlenül lehúzhatók onnan."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Személyre szabott navigációs gomb"</string>
+ <string name="keycode" msgid="7335281375728356499">"Billentyűkód"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"A billentyűkód gombok lehetővé teszik gombok hozzáadását a navigációs sávhoz. A gombok megnyomásuk esetén a kiválasztott billentyűt imitálják. Először ki kell választani a gombhoz tartozó billentyűt, majd a gombon megjeleníteni kívánt képet."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Billentyűgomb kiválasztása"</string>
+ <string name="preview" msgid="9077832302472282938">"Előnézet"</string>
</resources>
diff --git a/packages/SystemUI/res/values-hu/strings_tv.xml b/packages/SystemUI/res/values-hu/strings_tv.xml
deleted file mode 100644
index 73ba98d..0000000
--- a/packages/SystemUI/res/values-hu/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Kép a képben (PIP) bezárása"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Teljes képernyő"</string>
- <string name="pip_play" msgid="674145557658227044">"Lejátszás"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Szüneteltetés"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Mégse"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Tartsa nyomva a KEZDŐKÉPERNYŐ gombot a PIP funkció vezérléséhez"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-hy-rAM/strings.xml b/packages/SystemUI/res/values-hy-rAM/strings.xml
index d135933..18943e9 100644
--- a/packages/SystemUI/res/values-hy-rAM/strings.xml
+++ b/packages/SystemUI/res/values-hy-rAM/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"SIM չկա:"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Բջջային ցանցով տվյալների փոխանցումն անջատված է"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth-ը կապվում է:"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Ինքնաթիռային ռեժիմ"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"SIM քարտ չկա:"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"էկրանի ամրակցում"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"որոնել"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Հնարավոր չէ գործարկել <xliff:g id="APP">%s</xliff:g>-ը:"</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Ավելին"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"ևս <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Պատմություն"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Մաքրել"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Հորիզոնական տրոհում"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Ուղղահայաց տրոհում"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Հատուկ տրոհում"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Սովորական գույներ"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Գիշերային գույներ"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Հատուկ գույներ"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Ավտոմատ"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Անհայտ գույներ"</string>
<string name="color_transform" msgid="6985460408079086090">"Գույնի փոփոխում"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Ցույց տալ Արագ կարգավորումների սալիկը"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Ականջակալը կապակցված է"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Ականջակալը կապակցված է"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Միացնել կամ անջատել պատկերակների ցուցադրումը կարգավիճակի գոտում:"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Տվյալների խնայում"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Տվյալների խնայումը միացված է"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Տվյալների խնայումն անջատված է"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Միացնել"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Նավարկման գոտի"</string>
+ <string name="start" msgid="6873794757232879664">"Սկսել"</string>
+ <string name="center" msgid="4327473927066010960">"Կենտրոն"</string>
+ <string name="end" msgid="125797972524818282">"Վերջ"</string>
+ <string name="space" msgid="804232271282109749">"Բաժանիչ"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Ընտրացանկ/Ստեղնաշարի փոխարկիչ"</string>
+ <string name="select_button" msgid="1597989540662710653">"Ավելացնելու համար ընտրեք կոճակ"</string>
+ <string name="add_button" msgid="4134946063432258161">"Ավելացնել կոճակ"</string>
+ <string name="save" msgid="2311877285724540644">"Պահել"</string>
+ <string name="reset" msgid="2448168080964209908">"Վերակայել"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Գլխավոր էջի կոճակ չի գտնվել"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Այս սարքը նավարկելու համար պահանջվում է գլխավոր էջ վերադառնալու կոճակ: Պահելուց առաջ ավելացրեք գլխավոր էջ վերադառնալու կոճակ:"</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Կարգավորել կոճակի լայնությունը"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Սեղմատախտակ"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Սեղմատախտակ կոճակը թույլ է տալիս տարրերը քաշել անմիջապես դեպի սեղմատախտակ: Առկայության դեպքում տարրերը հնարավոր է նաև սեղմատախտակից դուրս քաշել:"</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Հատուկ նավարկման կոճակ"</string>
+ <string name="keycode" msgid="7335281375728356499">"Ստեղնային կոդ"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Ստեղնային կոդի կոճակները թույլ են տալիս Նավարկման գոտում ավելացնել ստեղնաշարի ստեղները: Սեղմելու դեպքում դրանք էմուլացնում են ստեղնաշարի ընտրված ստեղնը: Կոճակի համար նախ անհրաժեշտ է ընտրել ստեղնը, այնուհետև՝ կոճակի վրա ցուցադրվող պատկերը:"</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Ընտրեք ստեղնաշարի կոճակը"</string>
+ <string name="preview" msgid="9077832302472282938">"Նախադիտում"</string>
</resources>
diff --git a/packages/SystemUI/res/values-hy-rAM/strings_tv.xml b/packages/SystemUI/res/values-hy-rAM/strings_tv.xml
deleted file mode 100644
index 8113f09..0000000
--- a/packages/SystemUI/res/values-hy-rAM/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Փակել PIP-ն"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Լիէկրան"</string>
- <string name="pip_play" msgid="674145557658227044">"Նվագարկել"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Դադարեցնել"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Չեղարկել"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP-ն կառավարելու համար սեղմած պահեք HOME կոճակը"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml
index 6335c5d..887dc89 100644
--- a/packages/SystemUI/res/values-in/strings.xml
+++ b/packages/SystemUI/res/values-in/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Tidak ada SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Data Seluler Nonaktif"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Penambatan bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Mode pesawat."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Tidak ada kartu SIM."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pin ke layar"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"telusuri"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Tidak dapat memulai <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Lainnya"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> Lagi"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Riwayat"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Hapus"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Pisahkan Horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Pisahkan Vertikal"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Pisahkan Khusus"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Warna normal"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Warna malam"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Warna khusus"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Otomatis"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Warna tidak diketahui"</string>
<string name="color_transform" msgid="6985460408079086090">"Perubahan warna"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Tampilkan ubin Setelan Cepat"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Headphone terhubung"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Headset terhubung"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Aktifkan atau nonaktifkan ikon yang ditampilkan di bilah status."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Penghemat Data"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Penghemat Data aktif"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Penghemat Data nonaktif"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Aktif"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Bilah navigasi"</string>
+ <string name="start" msgid="6873794757232879664">"Awal"</string>
+ <string name="center" msgid="4327473927066010960">"Tengah"</string>
+ <string name="end" msgid="125797972524818282">"Akhir"</string>
+ <string name="space" msgid="804232271282109749">"Pengatur spasi"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Pengalih Menu / Keyboard"</string>
+ <string name="select_button" msgid="1597989540662710653">"Pilih tombol untuk ditambahkan"</string>
+ <string name="add_button" msgid="4134946063432258161">"Tambahkan tombol"</string>
+ <string name="save" msgid="2311877285724540644">"Simpan"</string>
+ <string name="reset" msgid="2448168080964209908">"Setel ulang"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Tidak ada tombol layar utama"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Tombol layar utama diperlukan agar dapat menavigasi perangkat ini. Tambahkan tombol layar uama sebelum menyimpan."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Sesuaikan lebar tombol"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Papan klip"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Papan klip memungkinkan item diseret langsung ke papan klip. Item juga dapat diseret langsung dari papan klik jika ada."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Tombol navigasi khusus"</string>
+ <string name="keycode" msgid="7335281375728356499">"Kode tombol"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Tombol untuk kode tombol memungkinkan keyboard ditambahkan ke Bilah Navigasi. Jika ditekan, tombol ini mengemulasi tombol keyboard yang dipilih. Terlebih dahulu tombol harus dipilih, diikuti dengan gambar yang akan ditampilkan."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Pilih Tombol Keyboard"</string>
+ <string name="preview" msgid="9077832302472282938">"Pratinjau"</string>
</resources>
diff --git a/packages/SystemUI/res/values-in/strings_tv.xml b/packages/SystemUI/res/values-in/strings_tv.xml
deleted file mode 100644
index b889231..0000000
--- a/packages/SystemUI/res/values-in/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Tutup PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Layar penuh"</string>
- <string name="pip_play" msgid="674145557658227044">"Putar"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Jeda"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Batal"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Tahan LAYAR UTAMA untuk mengontrol PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-is-rIS/strings.xml b/packages/SystemUI/res/values-is-rIS/strings.xml
index 76f5389..0786003 100644
--- a/packages/SystemUI/res/values-is-rIS/strings.xml
+++ b/packages/SystemUI/res/values-is-rIS/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Ekkert SIM-kort."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Slökkt á farsímagögnum"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Tjóðrun með Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Flugstilling"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Ekkert SIM-kort."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"skjáfesting"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"leita"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Ekki var hægt að ræsa <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Meira"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> í viðbót"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Ferill"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Hreinsa"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Lárétt skipting"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Lóðrétt skipting"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Sérsniðin skipting"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Venjulegir litir"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Næturlitir"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Sérsniðnir litir"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Sjálfvirkt"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Óþekktir litir"</string>
<string name="color_transform" msgid="6985460408079086090">"Litabreytingar"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Sýna flísar í flýtistillingum"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Heyrnartól tengd"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Höfuðtól tengt"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Birtu eða feldu myndtákn í stöðustikunni."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Gagnasparnaður"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Kveikt er á gagnasparnaði"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Slökkt er á gagnasparnaði"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Kveikt"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Yfirlitsstika"</string>
+ <string name="start" msgid="6873794757232879664">"Byrja"</string>
+ <string name="center" msgid="4327473927066010960">"Miðja"</string>
+ <string name="end" msgid="125797972524818282">"Ljúka"</string>
+ <string name="space" msgid="804232271282109749">"Bil"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Valmynd / lyklaborðsval"</string>
+ <string name="select_button" msgid="1597989540662710653">"Veldu hnapp til að bæta við"</string>
+ <string name="add_button" msgid="4134946063432258161">"Bæta við hnappi"</string>
+ <string name="save" msgid="2311877285724540644">"Vista"</string>
+ <string name="reset" msgid="2448168080964209908">"Endurstilla"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Enginn heimahnappur fannst"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Þörf er á heimahnappi til að hægt sé að fletta á þessu tæki. Bættu við heimahnappi áður en þú vistar."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Breyta breidd hnapps"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Klippiborð"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Hægt er að draga atriði beint yfir á klippiborðið. Eins má draga þau atriði sem eru þar fyrir beint út af klippiborðinu."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Sérsniðinn flettingahnappur"</string>
+ <string name="keycode" msgid="7335281375728356499">"Lykilkóði"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Með lykilkóðahnöppum má bæta lyklaborðshnöppum við yfirlitsstikuna. Þegar ýtt er á slíka hnappa líkja þeir eftir fyrirfram völdum lyklaborðshnöppum. Fyrst þarf að velja tiltekinn hnapp fyrir hvern þeirra og síðan þá mynd sem á að birtast á hnappnum."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Veldu lyklaborðshnapp"</string>
+ <string name="preview" msgid="9077832302472282938">"Forskoðun"</string>
</resources>
diff --git a/packages/SystemUI/res/values-is-rIS/strings_tv.xml b/packages/SystemUI/res/values-is-rIS/strings_tv.xml
deleted file mode 100644
index d91605e..0000000
--- a/packages/SystemUI/res/values-is-rIS/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Loka PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Allur skjárinn"</string>
- <string name="pip_play" msgid="674145557658227044">"Spila"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Hlé"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Hætta við"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Haltu HOME-lyklinum niðri til að stjórna PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml
index cfcd42c..f6373ff 100644
--- a/packages/SystemUI/res/values-it/strings.xml
+++ b/packages/SystemUI/res/values-it/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Nessuna SIM presente."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Rete dati disattivata"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Tethering Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Modalità aereo."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Nessuna SIM presente."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"blocco su schermo"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"cerca"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Impossibile avviare <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Altro"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Altre attività: <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Cronologia"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Cancella"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divisione in orizzontale"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divisione in verticale"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divisione personalizzata"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Colori normali"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Colori per la notte"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Colori personalizzati"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automatico"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Colori sconosciuti"</string>
<string name="color_transform" msgid="6985460408079086090">"Modifica del colore"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Mostra il riquadro Impostazioni rapide"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Cuffie collegate"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Auricolare collegato"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Consente di attivare o disattivare la visualizzazione delle icone nella barra di stato."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Risparmio dati"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Risparmio dati attivo"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Risparmio dati disattivato"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Attiva"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Barra di navigazione"</string>
+ <string name="start" msgid="6873794757232879664">"All\'inizio"</string>
+ <string name="center" msgid="4327473927066010960">"Al centro"</string>
+ <string name="end" msgid="125797972524818282">"Alla fine"</string>
+ <string name="space" msgid="804232271282109749">"Spaziatore"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Selettore menu/tastiera"</string>
+ <string name="select_button" msgid="1597989540662710653">"Selez. pulsante da aggiungere"</string>
+ <string name="add_button" msgid="4134946063432258161">"Aggiungi pulsante"</string>
+ <string name="save" msgid="2311877285724540644">"Salva"</string>
+ <string name="reset" msgid="2448168080964209908">"Reimposta"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Nessun pulsante Home trovato"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Per potersi spostare tra le funzioni del dispositivo, è necessario un pulsante Home. Aggiungine uno prima di salvare."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Modifica la larghezza del pulsante"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Appunti"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"La funzione Appunti consente di trascinare gli elementi direttamente negli appunti e fuori dagli appunti."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Pulsante di navigazione personalizzato"</string>
+ <string name="keycode" msgid="7335281375728356499">"Keycode"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"I pulsanti keycode consentono di aggiungere tasti della tastiera alla barra di navigazione. Quando vengono premuti, emulano il tasto selezionato. Innanzitutto è necessario selezionare il tasto da associare al pulsante, poi un\'immagine da mostrare sul pulsante."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Seleziona il tasto della tastiera"</string>
+ <string name="preview" msgid="9077832302472282938">"Anteprima"</string>
</resources>
diff --git a/packages/SystemUI/res/values-it/strings_tv.xml b/packages/SystemUI/res/values-it/strings_tv.xml
deleted file mode 100644
index 0279e45..0000000
--- a/packages/SystemUI/res/values-it/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Chiudi visualizzazione PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Schermo intero"</string>
- <string name="pip_play" msgid="674145557658227044">"Riproduci"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pausa"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Annulla"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Tieni premuto HOME per controllare la visualizzazione PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml
index 6fd3456..fe15d7f 100644
--- a/packages/SystemUI/res/values-iw/strings.xml
+++ b/packages/SystemUI/res/values-iw/strings.xml
@@ -148,6 +148,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"קצה"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"אין כרטיס SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"הנתונים הסלולריים כבויים"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"שיתוף אינטרנט דרך Bluetooth"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"מצב טיסה"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"אין כרטיס SIM."</string>
@@ -302,8 +303,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"הצמדת מסך"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"חפש"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"לא ניתן היה להפעיל את <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"עוד"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> נוספות"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"היסטוריה"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"נקה"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"פיצול אופקי"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"פיצול אנכי"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"פיצול מותאם אישית"</string>
@@ -469,6 +470,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"צבעים רגילים"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"צבעי לילה"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"צבעים מותאמים אישית"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"אוטומטי"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"צבעים לא ידועים"</string>
<string name="color_transform" msgid="6985460408079086090">"שינוי צבע"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"הצגת אריח של הגדרות מהירות"</string>
@@ -495,10 +497,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"אוזניות מחוברות"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"אוזניות מחוברות"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"הפעלה או השבתה של סמלים המוצגים בשורת הסטטוס."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"חוסך הנתונים (Data Saver)"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"חוסך הנתונים (Data Saver) פועל"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"חוסך הנתונים (Data Saver) כבוי"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"פועל"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"סרגל ניווט"</string>
+ <string name="start" msgid="6873794757232879664">"התחלה"</string>
+ <string name="center" msgid="4327473927066010960">"מרכז"</string>
+ <string name="end" msgid="125797972524818282">"סיום"</string>
+ <string name="space" msgid="804232271282109749">"רווח"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"מחליף תפריט / מקלדת"</string>
+ <string name="select_button" msgid="1597989540662710653">"בחירת לחצן להוספה"</string>
+ <string name="add_button" msgid="4134946063432258161">"הוסף לחצן"</string>
+ <string name="save" msgid="2311877285724540644">"שמור"</string>
+ <string name="reset" msgid="2448168080964209908">"איפוס"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"לחצן הבית לא נמצא"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"לחצן הבית נדרש כדי לנווט במכשיר הזה. הוסף לחצן בית לפני השמירה."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"שינוי של רוחב לחצן"</string>
+ <string name="clipboard" msgid="1313879395099896312">"לוח"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"בעזרת האפשרות \'לוח\', ניתן לגרור פריטים ישירות ללוח. ניתן גם לגרור פריטים ישירות מהלוח, כשהוא זמין."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"לחצן לניווט מותאם אישית"</string>
+ <string name="keycode" msgid="7335281375728356499">"קוד מפתח"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"לחצנים של קוד מפתח מאפשרים להוסיף מקשי מקלדת לסרגל הניווט. בעת הלחיצה הם מדמים את מקש המקלדת שנבחר. תחילה יש לבחור את המקש ללחצן, ולאחר מכן יש לבחור תמונה שתוצג בלחצן."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"בחירת לחצן מקלדת"</string>
+ <string name="preview" msgid="9077832302472282938">"תצוגה מקדימה"</string>
</resources>
diff --git a/packages/SystemUI/res/values-iw/strings_car.xml b/packages/SystemUI/res/values-iw/strings_car.xml
index 8d62258..4b7ba97 100644
--- a/packages/SystemUI/res/values-iw/strings_car.xml
+++ b/packages/SystemUI/res/values-iw/strings_car.xml
@@ -20,5 +20,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="car_lockscreen_disclaimer_title" msgid="7997539137376896441">"נסיעה בטוחה"</string>
- <string name="car_lockscreen_disclaimer_text" msgid="3061224684092952864">"עליך להיות מודע לתנאי הנהיגה באופן מלא, ולציית תמיד לדינים החלים. ייתכן שהמסלול אינו מדויק, לא שלם, מסוכן, לא מתאים, אסור למעבר או כרוך בחציית אזורים מנהליים. ייתכן שגם מידע עסקי לא יהיה מדויק או שלם. הנתונים אינם מדווחים בזמן אמת ולא ניתן להבטיח דיוק במיקום. אל תתעסק במכשיר הנייד שלך ואל תשתמש באפליקציות שאינן מיועדות ל-Android Auto בזמן הנהיגה."</string>
+ <string name="car_lockscreen_disclaimer_text" msgid="3061224684092952864">"שמור על עירנות לתנאי הנסיעה וציית תמיד לכללים והחוקים. ייתכן שהמסלול לא מדויק, לא שלם, מסוכן, לא מתאים, אסור למעבר או כרוך בחציית אזורים מנהליים. ייתכן גם שחלק מהמידע העסקי לא מדויק או לא שלם. הנתונים אינם מדווחים בזמן אמת ולא ניתן להבטיח דיוק במיקום. אל תתעסק במכשיר הנייד ואל תשתמש באפליקציות שאינן מיועדות ל-Android Auto בזמן הנהיגה."</string>
</resources>
diff --git a/packages/SystemUI/res/values-iw/strings_tv.xml b/packages/SystemUI/res/values-iw/strings_tv.xml
deleted file mode 100644
index a1bebb9..0000000
--- a/packages/SystemUI/res/values-iw/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"סגור PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"מסך מלא"</string>
- <string name="pip_play" msgid="674145557658227044">"הפעל"</string>
- <string name="pip_pause" msgid="8412075640017218862">"השהה"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"ביטול"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"המשך ללחוץ על HOME כדי לשלוט ב-PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml
index 189fcd9..d8bf205 100644
--- a/packages/SystemUI/res/values-ja/strings.xml
+++ b/packages/SystemUI/res/values-ja/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"SIMがありません。"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"モバイルデータ OFF"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetoothテザリング。"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"機内モード。"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"SIMカードが挿入されていません。"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"画面固定"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"検索"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g>を開始できません。"</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"もっと見る"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"他 <xliff:g id="NUMBER">%d</xliff:g> 件"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"履歴"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"消去"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"横に分割"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"縦に分割"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"分割（カスタム）"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"標準の色"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"夜間の色"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"カスタムの色"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"自動"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"不明な色"</string>
<string name="color_transform" msgid="6985460408079086090">"色の変更"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"[クイック設定] タイルの表示"</string>
@@ -499,4 +501,25 @@
<skip />
<!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
<skip />
+ <string name="switch_bar_on" msgid="1142437840752794229">"ON"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"ナビゲーション バー"</string>
+ <string name="start" msgid="6873794757232879664">"最初"</string>
+ <string name="center" msgid="4327473927066010960">"中央"</string>
+ <string name="end" msgid="125797972524818282">"最後"</string>
+ <string name="space" msgid="804232271282109749">"スペース"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"メニューとキーボードの切り替え"</string>
+ <string name="select_button" msgid="1597989540662710653">"追加するボタンの選択"</string>
+ <string name="add_button" msgid="4134946063432258161">"ボタンを追加"</string>
+ <string name="save" msgid="2311877285724540644">"保存"</string>
+ <string name="reset" msgid="2448168080964209908">"リセット"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"ホームボタンが見つかりません"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"この端末を操作できるようにするにはホームボタンが必要です。保存する前にホームボタンを追加してください。"</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"ボタンの幅の調整"</string>
+ <string name="clipboard" msgid="1313879395099896312">"クリップボード"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"クリップボード機能ではクリップボードにアイテムを直接ドラッグできます。クリップボードにアイテムがある場合、直接そのアイテムをドラッグして取り出すこともできます。"</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"カスタム ナビゲーション ボタン"</string>
+ <string name="keycode" msgid="7335281375728356499">"キーコード"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"キーコード ボタンを利用すると、ナビゲーション バーにキーボードのキー機能を追加できるようになります。ボタンを押すと選択済みのキーボードのキーがエミュレートされます。まずボタン用にキーを選択する必要があり、選択するとボタン上に画像が表示されます。"</string>
+ <string name="select_keycode" msgid="7413765103381924584">"キーボードのボタンの選択"</string>
+ <string name="preview" msgid="9077832302472282938">"プレビュー"</string>
</resources>
diff --git a/packages/SystemUI/res/values-ja/strings_tv.xml b/packages/SystemUI/res/values-ja/strings_tv.xml
deleted file mode 100644
index 08a5a1c..0000000
--- a/packages/SystemUI/res/values-ja/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP を閉じる"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"全画面表示"</string>
- <string name="pip_play" msgid="674145557658227044">"再生"</string>
- <string name="pip_pause" msgid="8412075640017218862">"一時停止"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"キャンセル"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"[ホーム] を押し続けると PIP を制御できます"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-ka-rGE/strings.xml b/packages/SystemUI/res/values-ka-rGE/strings.xml
index 07390f5..79fa408 100644
--- a/packages/SystemUI/res/values-ka-rGE/strings.xml
+++ b/packages/SystemUI/res/values-ka-rGE/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"SIM არ არის."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"მობილური ინტერნეტი გამორთულია"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth-ის ჩართვა"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"თვითმფრინავის რეჟიმი"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"SIM ბარათი არ არის."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ეკრანზე ჩამაგრება"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ძიება"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g>-ის გამოძახება ვერ მოხერხდა."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"მეტი"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"კიდევ <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"ისტორია"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"გასუფთავება"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ჰორიზონტალური გაყოფა"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ვერტიკალური გაყოფა"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"ინდივიდუალური გაყობა"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"ჩვეულებრივი ფერები"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"ღამის ფერები"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"მორგებული ფერები"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"ავტომატური"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"უცნობი ფერები"</string>
<string name="color_transform" msgid="6985460408079086090">"ფერების შეცვლა"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"სწრაფი პარამეტრების მოზაიკის ჩვენება"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"ყურსასმენები დაკავშირებულია"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"ყურსაცვამი დაკავშირებულია"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"სტატუსის ზოლში ხატულების ჩვენების ჩართვა ან გათიშვა."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"მონაცემთა დამზოგველი"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"მონაცემთა დამზოგველი ჩართულია"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"მონაცემთა დამზოგველი გამორთულია"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"ჩართული"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"ნავიგაციის ზოლი"</string>
+ <string name="start" msgid="6873794757232879664">"თავში"</string>
+ <string name="center" msgid="4327473927066010960">"ცენტრში"</string>
+ <string name="end" msgid="125797972524818282">"ბოლოში"</string>
+ <string name="space" msgid="804232271282109749">"ინტერვალი"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"მენიუს/კლავიატურის გადამრთველი"</string>
+ <string name="select_button" msgid="1597989540662710653">"აირჩიეთ დასამატებელი ღილაკი"</string>
+ <string name="add_button" msgid="4134946063432258161">"ღილაკის დამატება"</string>
+ <string name="save" msgid="2311877285724540644">"შენახვა"</string>
+ <string name="reset" msgid="2448168080964209908">"საწყისზე დაბრუნება"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"მთავარი ღილაკი ვერ მოიძებნა"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"ამ მოწყობილობაში ნავიგაციისთვის საჭიროა მთავარი ღილაკი. გთხოვთ, შენახვამდე დაამატოთ მთავარი ღილაკი."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"ღილაკის სიგანის კორექტირება"</string>
+ <string name="clipboard" msgid="1313879395099896312">"გაცვლის ბუფერი"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"გაცვლის ბუფერის მეშვეობით შესაძლებელია ერთეულების ჩავლებით პირდაპირ მასში გადატანა და ჩავლებითვე გამოტანა, როცა ის ხელმისაწვდომია."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"ნავიგაციის მორგებული ღილაკი"</string>
+ <string name="keycode" msgid="7335281375728356499">"კლავიშის კოდი"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"კლავიშის კოდის ტიპის ღილაკების მეშვეობით ნავიგაციის ზოლში კლავიატურის კლავიშების დამატება არის შესაძლებელი. მათზე დაჭერისას არჩეული კლავიატურის კლავიშის ემულაცია ხდება. პირველ რიგში, ღილაკისთვის უნდა აირჩეს კლავიში, ხოლო შემდეგ სურათი, რომელიც ღილაკზე უნდა იყოს ნაჩვენები."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"აირჩიეთ კლავიატურის ღილაკი"</string>
+ <string name="preview" msgid="9077832302472282938">"გადახედვა"</string>
</resources>
diff --git a/packages/SystemUI/res/values-ka-rGE/strings_tv.xml b/packages/SystemUI/res/values-ka-rGE/strings_tv.xml
deleted file mode 100644
index 83db37b..0000000
--- a/packages/SystemUI/res/values-ka-rGE/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP-ის დახურვა"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"სრულ ეკრანზე"</string>
- <string name="pip_play" msgid="674145557658227044">"დაკვრა"</string>
- <string name="pip_pause" msgid="8412075640017218862">"პაუზა"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"გაუქმება"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP-ის სამართავად, ხანგრძლივად დააჭირეთ მთავარ ღილაკს"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-kk-rKZ/strings.xml b/packages/SystemUI/res/values-kk-rKZ/strings.xml
index 02e773c..c5a89ff 100644
--- a/packages/SystemUI/res/values-kk-rKZ/strings.xml
+++ b/packages/SystemUI/res/values-kk-rKZ/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE (ұялы байланыстар жүйесіне арналған жетілдірілген деректер шамалары)"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"SIM жоқ."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Ұялы дерек өшірулі"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth тетеринг."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Ұшақ режимі."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"SIM картасы жоқ."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"экранды бекіту"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"іздеу"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> іске қосу мүмкін болмады."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Қосымша"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> Қосымша"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Тарих"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Тазалау"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Бөлінген көлденең"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Бөлінген тік"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Бөлінген теңшелетін"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Қалыпты түстер"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Түнгі түстер"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Арнаулы түстер"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Авто"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Белгісіз түстер"</string>
<string name="color_transform" msgid="6985460408079086090">"Түсті өзгерту"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Жылдам параметрлер торын көрсету"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Құлақаспап қосылды"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Құлақаспап жинағы қосылды"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Белгішелердің күй жолағында көрсетілуін қосу немесе өшіру"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Дерек сақтағыш"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Дерек сақтағыш қосулы"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Дерек сақтағышы өшірулі"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Қосулы"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Шарлау тақтасы"</string>
+ <string name="start" msgid="6873794757232879664">"Бастау"</string>
+ <string name="center" msgid="4327473927066010960">"Орталық"</string>
+ <string name="end" msgid="125797972524818282">"Аяқтау"</string>
+ <string name="space" msgid="804232271282109749">"Аралық"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Мәзір/пернетақта ауыстырғышы"</string>
+ <string name="select_button" msgid="1597989540662710653">"Қосу үшін түймені таңдаңыз"</string>
+ <string name="add_button" msgid="4134946063432258161">"Қосу түймесі"</string>
+ <string name="save" msgid="2311877285724540644">"Сақтау"</string>
+ <string name="reset" msgid="2448168080964209908">"Қайта реттеу"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Негізгі бет түймесі табылмады"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Негізгі бет түймесі осы құрылғыны шарлау үшін қажет. Сақтау алдында негізгі бет түймесін қосыңыз."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Түйме енін реттеу"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Буфер"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"\"Буфер\" элементтерді тікелей буферге сүйреуге мүмкіндік береді. Сондай-ақ, бар болса, элементтерді тікелей буферден сүйреп шығаруға болады."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Арнаулы шарлау түймесі"</string>
+ <string name="keycode" msgid="7335281375728356499">"Кілт коды"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Кілт коды түймелері пернетақта пернелерін шарлау тақтасына қосуға мүмкіндік береді. Басқан кезде олар таңдалған пернетақта пернесін эмуляциялайды. Алдымен түйме үшін пернені, содан кейін түймеде көрсетілетін кескінді таңдау керек."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Пернетақта түймесін таңдау"</string>
+ <string name="preview" msgid="9077832302472282938">"Алдын ала қарау"</string>
</resources>
diff --git a/packages/SystemUI/res/values-kk-rKZ/strings_tv.xml b/packages/SystemUI/res/values-kk-rKZ/strings_tv.xml
deleted file mode 100644
index 6339f42..0000000
--- a/packages/SystemUI/res/values-kk-rKZ/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP жабу"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Толық экран"</string>
- <string name="pip_play" msgid="674145557658227044">"Ойнату"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Кідірту"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Бас тарту"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP басқару үшін «Негізгі бет» түймесін ұстап тұрыңыз"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-km-rKH/strings.xml b/packages/SystemUI/res/values-km-rKH/strings.xml
index 513a5b8..6baaa78 100644
--- a/packages/SystemUI/res/values-km-rKH/strings.xml
+++ b/packages/SystemUI/res/values-km-rKH/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"វ៉ាយហ្វាយ"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"គ្មានស៊ីមកាត។"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"ទិន្នន័យចល័តបានបិទ"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"ការភ្ជាប់ប៊្លូធូស។"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"របៀបពេលជិះយន្តហោះ"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"គ្មានស៊ីមកាតទេ។"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ការភ្ជាប់អេក្រង់"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ស្វែងរក"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"មិនអាចចាប់ផ្ដើម <xliff:g id="APP">%s</xliff:g> ទេ។"</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"ច្រើនទៀត"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> ទៀត"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"ប្រវត្តិ"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"សម្អាត"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"បំបែកផ្តេក"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"បំបែកបញ្ឈរ"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"បំបែកផ្ទាល់ខ្លួន"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"ពណ៌ធម្មតា"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"ពណ៌ពេលយប់"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"ពណ៌ផ្ទាល់ខ្លួន"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"ស្វ័យប្រវត្តិ"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"ពណ៌មិនស្គាល់"</string>
<string name="color_transform" msgid="6985460408079086090">"ការកែសម្រួលពណ៌"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"បង្ហាញផ្ទាំងប្រអប់ការកំណត់រហ័ស"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"បានភ្ជាប់កាស"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"បានភ្ជាប់កាស"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"បើក ឬបិទដំណើរការបង្ហាញរូបតំណាងនៅលើរបារស្ថានភាព"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"កម្មវិធីសន្សំសំចៃទិន្នន័យ"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"កម្មវិធីសន្សំសំចៃទិន្នន័យបានបើក"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"កម្មវិធីសន្សំសំចៃទិន្នន័យបានបិទ"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"បើក"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"របាររុករក"</string>
+ <string name="start" msgid="6873794757232879664">"ចាប់ផ្ដើម"</string>
+ <string name="center" msgid="4327473927066010960">"កណ្តាល"</string>
+ <string name="end" msgid="125797972524818282">"បញ្ចប់"</string>
+ <string name="space" msgid="804232271282109749">"ចន្លោះ"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"កម្មវិធីប្តូរក្តារចុច / ម៉ឺនុយ"</string>
+ <string name="select_button" msgid="1597989540662710653">"ជ្រើសប៊ូតុងដែលត្រូវថែម"</string>
+ <string name="add_button" msgid="4134946063432258161">"បន្ថែមប៊ូតុង"</string>
+ <string name="save" msgid="2311877285724540644">"រក្សាទុក"</string>
+ <string name="reset" msgid="2448168080964209908">"កំណត់ឡើងវិញ"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"រកមិនឃើញប៊ូតុងដើមទេ"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"តម្រូវឲ្យមានប៊ូតុងដើមដើម្បីអាចរុករកឧបករណ៍នេះបាន។ សូមបន្ថែមប៊ូតុងដើមមុនពេលរក្សាទុក។"</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"កែសម្រួលទទឹងប៊ូតុង"</string>
+ <string name="clipboard" msgid="1313879395099896312">"ក្ដារតម្បៀតខ្ទាស់"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"ក្តារតម្បៀតខ្ទាស់អនុញ្ញាតឲ្យមានការអូសធាតុដោយផ្ទាល់ទៅកាន់ក្តារតម្បៀតខ្ទាស់នោះ។ នៅពេលដែលមានធាតុស្រាប់ក្នុងក្តារតម្បៀតខ្ទាស់ ធាតុទាំងនោះក៏អាចអូសដោយផ្ទាល់ចេញពីក្តារតម្បៀតខ្ទាស់បានដែរ។"</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"ប៊ូតុងរុករកផ្ទាល់ខ្លួន"</string>
+ <string name="keycode" msgid="7335281375728356499">"លេខកូដគ្រាប់ចុច"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"ប៊ូតុងលេខកូដគ្រាប់ចុចអនុញ្ញាតឲ្យមានការបន្ថែមគ្រាប់ចុចនៃក្តារចុចទៅក្នុងរបាររុករក។ នៅពេលចុចប៊ូតុងទាំងនោះ ពួកវាបង្កើតមុខងារឲ្យគ្រាប់ចុចនៃក្តារចុចដែលបានជ្រើស។ សូមជ្រើសរើសគ្រាប់ចុចសម្រាប់ប៊ូតុងជាមុនសិន មុនពេលដែលរូបភាពត្រូវបានបង្ហាញនៅលើប៊ូតុង។"</string>
+ <string name="select_keycode" msgid="7413765103381924584">"ជ្រើសប៊ូតុងក្តារចុច"</string>
+ <string name="preview" msgid="9077832302472282938">"មើលជាមុន"</string>
</resources>
diff --git a/packages/SystemUI/res/values-km-rKH/strings_tv.xml b/packages/SystemUI/res/values-km-rKH/strings_tv.xml
deleted file mode 100644
index 6e6172c..0000000
--- a/packages/SystemUI/res/values-km-rKH/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"បិទ PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"ពេញអេក្រង់"</string>
- <string name="pip_play" msgid="674145557658227044">"ចាក់"</string>
- <string name="pip_pause" msgid="8412075640017218862">"ផ្អាក"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"បោះបង់"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"សង្កត់ប៊ូតុងដើម ដើម្បីគ្រប់គ្រង PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-kn-rIN/strings.xml b/packages/SystemUI/res/values-kn-rIN/strings.xml
index a64fe5a..1c38684 100644
--- a/packages/SystemUI/res/values-kn-rIN/strings.xml
+++ b/packages/SystemUI/res/values-kn-rIN/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"ಎಡ್ಜ್"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"ಯಾವುದೇ ಸಿಮ್ ಇಲ್ಲ."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ ಆಫ್ ಆಗಿದೆ"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"ಬ್ಲೂಟೂತ್ ಟೆಥರಿಂಗ್."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"ಏರೋಪ್ಲೇನ್ ಮೋಡ್"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"ಯಾವುದೇ ಸಿಮ್ ಇಲ್ಲ."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ಸ್ಕ್ರೀನ್ ಪಿನ್ನಿಂಗ್"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ಹುಡುಕಾಟ"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> ಪ್ರಾರಂಭಿಸಲು ಸಾದ್ಯವಿಲ್ಲ."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"ಇನ್ನಷ್ಟು"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> ಇನ್ನಷ್ಟು"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"ಇತಿಹಾಸ"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"ತೆರವುಗೊಳಿಸು"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ಅಡ್ಡಲಾಗಿ ವಿಭಜಿಸಿದ"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ಲಂಬವಾಗಿ ವಿಭಜಿಸಿದ"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"ಕಸ್ಟಮ್ ವಿಭಜಿಸಿದ"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"ಸಾಮಾನ್ಯ ಬಣ್ಣಗಳು"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"ರಾತ್ರಿ ಬಣ್ಣಗಳು"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"ಕಸ್ಟಮ್ ಬಣ್ಣಗಳು"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"ಸ್ವಯಂ"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"ಅಪರಿಚಿತ ಬಣ್ಣಗಳು"</string>
<string name="color_transform" msgid="6985460408079086090">"ಬಣ್ಣ ಬದಲಾವಣೆ"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್ಗಳ ಟೈಲ್ ತೋರಿಸು"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"ಹೆಡ್ಫೋನ್ ಸಂಪರ್ಕಪಡಿಸಲಾಗಿದೆ"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"ಹೆಡ್ಸೆಟ್ ಸಂಪರ್ಕಪಡಿಸಲಾಗಿದೆ"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"ಸ್ಥಿತಿ ಪಟ್ಟಿಯಲ್ಲಿ ಐಕಾನ್ಗಳು ತೋರಿಸುವುದನ್ನು ಸಕ್ರಿಯ ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"ಡೇಟಾ ಉಳಿಸುವಿಕೆ"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"ಡೇಟಾ ಉಳಿಸುವಿಕೆ ಆನ್ ಆಗಿದೆ"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"ಡೇಟಾ ಉಳಿಸುವಿಕೆ ಆಫ್ ಆಗಿದೆ"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"ಆನ್"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"ನ್ಯಾವಿಗೇಷನ್ ಬಾರ್"</string>
+ <string name="start" msgid="6873794757232879664">"ಪ್ರಾರಂಭ"</string>
+ <string name="center" msgid="4327473927066010960">"ಮಧ್ಯ"</string>
+ <string name="end" msgid="125797972524818282">"ಮುಕ್ತಾಯ"</string>
+ <string name="space" msgid="804232271282109749">"ಸ್ಪೇಸರ್"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"ಮೆನು / ಕೀಬೋರ್ಡ್ ಬದಲಾಯಿಸುವಿಕೆ"</string>
+ <string name="select_button" msgid="1597989540662710653">"ಸೇರಿಸಲು ಬಟನ್ ಆಯ್ಕೆಮಾಡಿ"</string>
+ <string name="add_button" msgid="4134946063432258161">"ಬಟನ್ ಸೇರಿಸು"</string>
+ <string name="save" msgid="2311877285724540644">"ಉಳಿಸು"</string>
+ <string name="reset" msgid="2448168080964209908">"ಮರುಹೊಂದಿಸು"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"ಯಾವುದೇ ಹೋಮ್ ಬಟನ್ ಕಂಡುಬಂದಿಲ್ಲ"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"ಈ ಸಾಧನವನ್ನು ನ್ಯಾವಿಗೇಟ್ ಮಾಡಲು ಹೋಮ್ ಬಟನ್ ಅಗತ್ಯವಿರುತ್ತದೆ. ಉಳಿಸುವ ಮೊದಲು ದಯವಿಟ್ಟು ಹೋಮ್ ಬಟನ್ ಸೇರಿಸಿ."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"ಬಟನ್ ಅಳತೆ ಹೊಂದಿಸು"</string>
+ <string name="clipboard" msgid="1313879395099896312">"ಕ್ಲಿಪ್ಬೋರ್ಡ್"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"ಐಟಂಗಳನ್ನು ನೇರವಾಗಿ ಕ್ಲಿಪ್ಬೋರ್ಡ್ಗೆ ಡ್ರ್ಯಾಗ್ ಮಾಡಲು ಕ್ಲಿಪ್ಬೋರ್ಡ್ ಅನುಮತಿಸುತ್ತದೆ. ಐಟಂಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿರುವಾಗ ಅವುಗಳನ್ನು ಕ್ಲಿಪ್ಬೋರ್ಡ್ನಿಂದ ನೇರವಾಗಿ ಹೊರಗೆ ಹಾಕಬಹುದಾಗಿರುತ್ತದೆ."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"ಕಸ್ಟಮ್ ನ್ಯಾವಿಗೇಷನ್ ಬಟನ್"</string>
+ <string name="keycode" msgid="7335281375728356499">"ಕೀಕೋಡ್"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"ಕೀಕೋಡ್ ಬಟನ್ಗಳು ಕೀಬೋರ್ಡ್ ಕೀಗಳನ್ನು ನ್ಯಾವಿಗೇಷನ್ ಬಾರ್ಗೆ ಸೇರಿಸಲು ಆನುಮತಿಸುತ್ತದೆ. ಒತ್ತಿದಾಗ ಆಯ್ಕೆಮಾಡಲಾದ ಕೀಬೋರ್ಡ್ ಕೀಯನ್ನು ಅವುಗಳು ಅನುಕರಿಸುತ್ತವೆ. ಮೊದಲು ಬಟನ್ಗೆ ಕೀಯನ್ನು ಆಯ್ಕೆಮಾಡಬೇಕು ನಂತರ ಬಟನ್ನಲ್ಲಿ ತೋರಿಸಬೇಕಾದ ಚಿತ್ರವನ್ನು ಅನುಸರಿಸಬೇಕು."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"ಕೀಬೋರ್ಡ್ ಬಟನ್ ಆಯ್ಕೆಮಾಡಿ"</string>
+ <string name="preview" msgid="9077832302472282938">"ಪೂರ್ವವೀಕ್ಷಣೆ"</string>
</resources>
diff --git a/packages/SystemUI/res/values-kn-rIN/strings_tv.xml b/packages/SystemUI/res/values-kn-rIN/strings_tv.xml
deleted file mode 100644
index c2a7095..0000000
--- a/packages/SystemUI/res/values-kn-rIN/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP ಮುಚ್ಚಿ"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"ಪೂರ್ಣ ಪರದೆ"</string>
- <string name="pip_play" msgid="674145557658227044">"ಪ್ಲೇ"</string>
- <string name="pip_pause" msgid="8412075640017218862">"ವಿರಾಮ"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"ರದ್ದುಮಾಡು"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP ನಿಯಂತ್ರಿಸಲು HOME ಹೋಲ್ಡ್ ಮಾಡಿ"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml
index 30a9422..f7c3d3a 100644
--- a/packages/SystemUI/res/values-ko/strings.xml
+++ b/packages/SystemUI/res/values-ko/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"SIM이 없습니다."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"모바일 데이터가 사용 중지됨"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"블루투스 테더링입니다."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"비행기 모드입니다."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"SIM 카드가 없습니다."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"화면 고정"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"검색"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g>을(를) 시작할 수 없습니다."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"더보기"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g>개 더보기"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"기록"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"삭제"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"수평 분할"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"수직 분할"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"맞춤 분할"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"일반 색상"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"야간 색상"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"맞춤 색상"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"자동"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"알 수 없는 색상"</string>
<string name="color_transform" msgid="6985460408079086090">"색상 수정"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"빠른 설정 타일 표시"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"헤드폰 연결됨"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"헤드셋 연결됨"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"아이콘이 상태 표시줄에 표시되도록 사용 설정 또는 중지합니다."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"데이터 세이버"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"데이터 세이버 사용"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"데이터 세이버 사용 안함"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"사용"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"탐색 메뉴"</string>
+ <string name="start" msgid="6873794757232879664">"시작"</string>
+ <string name="center" msgid="4327473927066010960">"중앙"</string>
+ <string name="end" msgid="125797972524818282">"끝"</string>
+ <string name="space" msgid="804232271282109749">"공백"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"메뉴/키보드 전환 도구"</string>
+ <string name="select_button" msgid="1597989540662710653">"추가할 버튼 선택"</string>
+ <string name="add_button" msgid="4134946063432258161">"버튼 추가"</string>
+ <string name="save" msgid="2311877285724540644">"저장"</string>
+ <string name="reset" msgid="2448168080964209908">"초기화"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"홈 버튼을 찾지 못함"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"이 기기를 탐색하려면 홈 버튼을 사용해야 합니다. 홈 버튼을 추가한 다음 저장하세요."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"버튼 너비 조정"</string>
+ <string name="clipboard" msgid="1313879395099896312">"클립보드"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"클립보드를 사용하면 항목을 클립보드로 바로 드래그할 수 있습니다. 또한 발표 시 항목을 클립보드 밖으로 바로 드래그할 수도 있습니다."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"맞춤 탐색 버튼"</string>
+ <string name="keycode" msgid="7335281375728356499">"키 코드"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"키 코드 버튼을 사용하면 키보드 키를 탐색 메뉴에 추가할 수 있습니다. 키 코드 버튼을 누르면 선택된 키보드 키가 에뮬레이션됩니다. 먼저 버튼에 대해 키를 선택하고 그다음 버튼에 표시될 이미지를 선택해야 합니다."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"키보드 버튼 선택"</string>
+ <string name="preview" msgid="9077832302472282938">"미리보기"</string>
</resources>
diff --git a/packages/SystemUI/res/values-ko/strings_car.xml b/packages/SystemUI/res/values-ko/strings_car.xml
index e18e587..fcc2d7b 100644
--- a/packages/SystemUI/res/values-ko/strings_car.xml
+++ b/packages/SystemUI/res/values-ko/strings_car.xml
@@ -20,5 +20,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="car_lockscreen_disclaimer_title" msgid="7997539137376896441">"안전 운전"</string>
- <string name="car_lockscreen_disclaimer_text" msgid="3061224684092952864">"도로 상황에 주의를 기울이고 관련 법규를 항상 준수하세요. 길찾기는 부정확하거나 불완전하거나 위험하거나 부적당하거나 금지되거나 여러 행정구역에 걸친 지역을 지나도록 안내할 수 있습니다. 비즈니스 정보 또한 부정확하거나 불완전할 수 있습니다. 데이터는 실시간이 아니며 위치의 정확도를 보증할 수 없습니다. 운전 중에 휴대기기를 조작하거나 Android Auto가 지원되지 않는 앱을 사용해서는 안 됩니다."</string>
+ <string name="car_lockscreen_disclaimer_text" msgid="3061224684092952864">"도로 상황에 주의를 기울이고 관련 법규를 항상 준수하세요. 경로가 정확하지 않거나 불완전하거나 위험하거나 적합하지 않을 수 있으며 금지된 지역이나 여러 행정 구역을 통과할 수 있습니다. 비즈니스 정보 또한 부정확하거나 불완전할 수 있습니다. 데이터는 실시간이 아니며 위치의 정확도를 보증할 수 없습니다. 운전 중에 휴대기기를 조작하거나 Android Auto가 지원되지 않는 앱을 사용해서는 안 됩니다."</string>
</resources>
diff --git a/packages/SystemUI/res/values-ko/strings_tv.xml b/packages/SystemUI/res/values-ko/strings_tv.xml
deleted file mode 100644
index 158f4ad..0000000
--- a/packages/SystemUI/res/values-ko/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP 닫기"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"전체화면"</string>
- <string name="pip_play" msgid="674145557658227044">"재생"</string>
- <string name="pip_pause" msgid="8412075640017218862">"일시중지"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"취소"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP를 제어하려면 홈을 누르세요."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-ky-rKG/strings.xml b/packages/SystemUI/res/values-ky-rKG/strings.xml
index 873cf37..197a76c7 100644
--- a/packages/SystemUI/res/values-ky-rKG/strings.xml
+++ b/packages/SystemUI/res/values-ky-rKG/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"SIM карта жок."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Уюлдук дайындар өчүк"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth аркылуу интернет бөлүшүү."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Учак тартиби."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"SIM-карта жок"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"экран кадоо"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"издөө"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> баштай алган жок."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Дагы"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Дагы <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Таржымал"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Тазалоо"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Туурасынан бөлүү"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Тигинен бөлүү"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Ыңгайлаштырылган бөлүү"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Кадимки түстөр"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Түнкү түстөр"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Ыңгайлаштырылган түстөр"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Авто"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Белгисиз түстөр"</string>
<string name="color_transform" msgid="6985460408079086090">"Түсүн өзгөртүү"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Ыкчам жөндөөлөр тактасын көрсөтүү"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Гарнитуралар туташкан"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Гарнитура туташты"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Абал тилкесиндеги сүрөтчөнү иштетүү же өчүрүү."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Дайындарды үнөмдөгүч"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Дайындарды үнөмдөгүч күйүк"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Дайындарды үнөмдөгүч өчүрүлгөн"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Күйүк"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Чабыттоо тилкеси"</string>
+ <string name="start" msgid="6873794757232879664">"Баштоо"</string>
+ <string name="center" msgid="4327473927066010960">"Борбор"</string>
+ <string name="end" msgid="125797972524818282">"Бүтүрүү"</string>
+ <string name="space" msgid="804232271282109749">"Боштук калтыргыч"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Меню / Баскычтоп которуштургуч"</string>
+ <string name="select_button" msgid="1597989540662710653">"Кошула турган баскычты тандоо"</string>
+ <string name="add_button" msgid="4134946063432258161">"Баскыч кошуу"</string>
+ <string name="save" msgid="2311877285724540644">"Сактоо"</string>
+ <string name="reset" msgid="2448168080964209908">"Баштапкы абалга келтирүү"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Башкы бет баскычы табылган жок"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Бул түзмөктө чабыттоо үчүн башкы бет баскычы керек. Сактаардан мурун, башкы бет баскычын кошуңуз."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Баскычтын жазылыгын тууралоо"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Алмашуу буфери"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Алмашуу буфери нерселерди түздөн-түз буферге сүйрөө мүмкүнчүлүгүн берет. Нерселерди буферден түздөн-түз сүйрөп чыкса да болот."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Ыңгайлаштырылган чабыттоо баскычы"</string>
+ <string name="keycode" msgid="7335281375728356499">"Баскыч коду"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Баскыч коддору баскычтоптун баскычтарын Чабыттоо тилкесине кошуу мүмкүнчүлүгүн берет. Алар басылганда, баскычтоптогу тандалган баскычтын функциясын аткарат. Адегенде баскыч, андан соң баскычта көрсөтүлө турган сүрөт тандалат."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Баскычтоптогу баскычты тандоо"</string>
+ <string name="preview" msgid="9077832302472282938">"Алдын ала көрүү"</string>
</resources>
diff --git a/packages/SystemUI/res/values-ky-rKG/strings_tv.xml b/packages/SystemUI/res/values-ky-rKG/strings_tv.xml
deleted file mode 100644
index c54d0d2..0000000
--- a/packages/SystemUI/res/values-ky-rKG/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP жабуу"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Толук экран"</string>
- <string name="pip_play" msgid="674145557658227044">"Ойнотуу"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Тындыруу"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Жокко чыгаруу"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP көзөмөлдөө үчүн БАШКЫ БЕТ баскычын кармап туруңуз"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-lo-rLA/strings.xml b/packages/SystemUI/res/values-lo-rLA/strings.xml
index 7a85446..d003a04 100644
--- a/packages/SystemUI/res/values-lo-rLA/strings.xml
+++ b/packages/SystemUI/res/values-lo-rLA/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"ບໍ່ມີຊິມ."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"ຂໍ້ມູນເຄືອຂ່າຍມືຖືປິດຢູ່"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"ການປ່ອຍສັນຍານ Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"ໂໝດໃນຍົນ."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"ບໍ່ມີແຜ່ນ SIM."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ການປັກໝຸດໜ້າຈໍ"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ຊອກຫາ"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"ບໍ່ສາມາດເລີ່ມ <xliff:g id="APP">%s</xliff:g> ໄດ້."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"ເພີ່ມເຕີມ"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> ເພີ່ມເຕີມ"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"ປະຫວັດ"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"ລຶບ"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ການແຍກລວງຂວາງ"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ການແຍກລວງຕັ້ງ"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"ການແຍກກຳນົດເອງ"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"ສີປົກກະຕິ"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"ສີຕອນກາງຄືນ"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"ສີແບບກຳນົດເອງ"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"ອັດຕະໂນມັດ"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"ສີທີ່ບໍ່ຮູ້ຈັກ"</string>
<string name="color_transform" msgid="6985460408079086090">"ການດັດແປງສີ"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"ສະແດງໄທລ໌ການຕັ້ງຄ່າດ່ວນ"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"ເຊື່ອມຕໍ່ຊຸດຫູຟັງແລ້ວ"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"ເຊື່ອມຕໍ່ຊຸດຫູຟັງແລ້ວ"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"ເປີດ ຫຼື ປິດໄອຄອນຕ່າງໆຈາກການສະແດງໃນແຖບສະຖານະ."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"ຕົວປະຢັດຂໍ້ມູນ"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"ຕົວປະຢັດຂໍ້ມູນເປີດຢູ່"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"ຕົວປະຢັດຂໍ້ມູນປິດຢູ່"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"ເປີດ"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"ແຖບນຳທາງ"</string>
+ <string name="start" msgid="6873794757232879664">"ເລີ່ມຕົ້ນ"</string>
+ <string name="center" msgid="4327473927066010960">"ເຄິ່ງກາງ"</string>
+ <string name="end" msgid="125797972524818282">"ທ້າຍ"</string>
+ <string name="space" msgid="804232271282109749">"Spacer"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"ຕົວປ່ຽນເມນູ / ແປ້ນພິມ"</string>
+ <string name="select_button" msgid="1597989540662710653">"ເລືອກປຸ່ມເພື່ອເພີ່ມ"</string>
+ <string name="add_button" msgid="4134946063432258161">"ເພີ່ມປຸ່ມ"</string>
+ <string name="save" msgid="2311877285724540644">"ບັນທຶກ"</string>
+ <string name="reset" msgid="2448168080964209908">"ຣີເຊັດ"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"ບໍ່ພົບປຸ່ມໜ້າຫຼັກ"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"ຈຳເປັນຕ້ອງມີປຸ່ມໜ້າຫຼັກເພື່ອໃຫ້ສາມາດນຳທາງອຸປະກອນນີ້. ກະລຸນາເພີ່ມປຸ່ມໜ້າຫຼັກກ່ອນທີ່ຈະບັນທຶກ."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"ປັບຄວາມກວ້າງຂອງປຸ່ມ"</string>
+ <string name="clipboard" msgid="1313879395099896312">"ຄລິບບອດ"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"ຄລິບບອດອະນຸຍາດໃຫ້ລາກລາຍການຕ່າງໆໂດຍກົງຫາຄລິບບອດ. ນອກນັ້ນ ຍັງສາມາດລາກລາຍການໂດຍກົງອອກຈາກຄລິບບອດໄດ້ ເມື່ອມີຢູ່."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"ປຸ່ມນຳທາງແບບກຳນົດເອງ"</string>
+ <string name="keycode" msgid="7335281375728356499">"Keycode"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"ປຸ່ມ Keycode ອະນຸຍາດໃຫ້ເພີ່ມປຸ່ມແປ້ນພິມໃສ່ແຖບການນຳທາງ. ເມື່ອກົດແລ້ວພວກມັນຈະຮຽນແບບປຸ່ມແປ້ນພິມທີ່ເລືອກ. ທຳອິດຕ້ອງເລືອກປຸ່ມແປ້ນພິມສຳລັບປຸ່ມນັ້ນ, ຕາມດ້ວຍຮູບທີ່ຈະປາກົດຂຶ້ນເທິງປຸ່ມນັ້ນ."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"ເລືອກປຸ່ມແປ້ນພິມ"</string>
+ <string name="preview" msgid="9077832302472282938">"ສະແດງຕົວຢ່າງ"</string>
</resources>
diff --git a/packages/SystemUI/res/values-lo-rLA/strings_tv.xml b/packages/SystemUI/res/values-lo-rLA/strings_tv.xml
deleted file mode 100644
index 289d4e2..0000000
--- a/packages/SystemUI/res/values-lo-rLA/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"ປິດ PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"ເຕັມໜ້າຈໍ"</string>
- <string name="pip_play" msgid="674145557658227044">"ຫຼິ້ນ"</string>
- <string name="pip_pause" msgid="8412075640017218862">"ຢຸດຊົ່ວຄາວ"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"ຍົກເລີກ"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"ກົດຄ້າງປຸ່ມ HOME ເພື່ອຄວບຄຸມ PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml
index c9a5959..7ea958b 100644
--- a/packages/SystemUI/res/values-lt/strings.xml
+++ b/packages/SystemUI/res/values-lt/strings.xml
@@ -148,6 +148,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Kraštas"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Nėra SIM kortelės."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobiliojo ryšio duomenys išjungti"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"„Bluetooth“ įrenginio kaip modemo naudojimas."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Lėktuvo režimas."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Nėra SIM kortelės."</string>
@@ -302,8 +303,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ekrano prisegimas"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"paieška"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Nepavyko paleisti <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Daugiau"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Dar <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Istorija"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Išvalyti"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Horizontalus skaidymas"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Vertikalus skaidymas"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Tinkintas skaidymas"</string>
@@ -469,6 +470,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Įprastos spalvos"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Nakties spalvos"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Tinkintos spalvos"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automatinis"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Nežinomos spalvos"</string>
<string name="color_transform" msgid="6985460408079086090">"Spalvų keitimas"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Rodyti Sparčiųjų nustatymų išklotinės elementą"</string>
@@ -495,10 +497,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Ausinės prijungtos"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Ausinės prijungtos"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Įgalinti arba išjungti piktogramų rodymą būsenos juostoje."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Duomenų taupymo priemonė"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Duomenų taupymo priemonė įjungta"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Duomenų taupymo priemonė išjungta"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Įjungti"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Naršymo juosta"</string>
+ <string name="start" msgid="6873794757232879664">"Pradėti"</string>
+ <string name="center" msgid="4327473927066010960">"Centre"</string>
+ <string name="end" msgid="125797972524818282">"Baigti"</string>
+ <string name="space" msgid="804232271282109749">"Skirtukas"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Meniu / klaviatūros perjung."</string>
+ <string name="select_button" msgid="1597989540662710653">"Norimo pridėti mygt. pasirink."</string>
+ <string name="add_button" msgid="4134946063432258161">"Pridėti mygtuką"</string>
+ <string name="save" msgid="2311877285724540644">"Išsaugoti"</string>
+ <string name="reset" msgid="2448168080964209908">"Atstatyti"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Pagr. pusl. mygtukas nerastas"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Kad būtų galima naršyti šį įrenginį, reikalingas pagrindinio puslapio mygtukas. Prieš išsaugodami pridėkite pagrindinio puslapio mygtuką."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Mygtuko pločio koregavimas"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Iškarpinė"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Naudojant Iškarpinę galima vilkti elementus tiesiai į iškarpinę. Be to, rodomus elementus galima vilkti tiesiai iš iškarpinės."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Tinkintas naršymo mygtukas"</string>
+ <string name="keycode" msgid="7335281375728356499">"Klavišo kodas"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Klavišų kodų mygtukais galima pridėti klaviatūros klavišus prie naršymo juostos. Paspaudus jie imituoja pasirinktą klaviatūros klavišą. Pirmiausia reikia pasirinkti mygtuko klavišą su vaizdu, kuris turėtų būti rodomas ant mygtuko."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Klaviatūros mygtuko pasirinkimas"</string>
+ <string name="preview" msgid="9077832302472282938">"Peržiūrėti"</string>
</resources>
diff --git a/packages/SystemUI/res/values-lt/strings_tv.xml b/packages/SystemUI/res/values-lt/strings_tv.xml
deleted file mode 100644
index b9719c4..0000000
--- a/packages/SystemUI/res/values-lt/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Uždaryti PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Visas ekranas"</string>
- <string name="pip_play" msgid="674145557658227044">"Leisti"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pristabdyti"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Atšaukti"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Jei norite valdyti PIP, palaikykite paspaudę mygtuką HOME"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml
index 5e115a8..da3ff25 100644
--- a/packages/SystemUI/res/values-lv/strings.xml
+++ b/packages/SystemUI/res/values-lv/strings.xml
@@ -147,6 +147,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Nav SIM kartes."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobilie dati ir atslēgti"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth piesaiste."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Lidmašīnas režīms."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Nav SIM kartes."</string>
@@ -301,8 +302,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"Piespraust ekrānu"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"Meklēt"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Nevarēja palaist lietotni <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Vairāk"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Vēl <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Vēsture"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Notīrīt"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Horizontāls dalījums"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Vertikāls dalījums"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Pielāgots dalījums"</string>
@@ -468,6 +469,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Parastas krāsas"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Nakts krāsas"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Pielāgotas krāsas"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automātiski"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Nezināmas krāsas"</string>
<string name="color_transform" msgid="6985460408079086090">"Krāsu pārveidošana"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Ātro iestatījumu elementa rādīšana"</string>
@@ -494,10 +496,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Austiņas ir pievienotas"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Austiņas ar mikrofonu ir pievienotas"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Iespējojiet vai atspējojiet ikonu rādīšanu statusa joslā."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Datu lietojuma samazinātājs"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Datu lietojuma samazinātājs ieslēgts"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Datu lietojuma samazinātājs ir izslēgts."</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Ieslēgts"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigācijas josla"</string>
+ <string name="start" msgid="6873794757232879664">"Sākums"</string>
+ <string name="center" msgid="4327473927066010960">"Centrs"</string>
+ <string name="end" msgid="125797972524818282">"Beigas"</string>
+ <string name="space" msgid="804232271282109749">"Atstarpes elements"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Izvēlnes/tastatūras slēdzis"</string>
+ <string name="select_button" msgid="1597989540662710653">"Pievienojamās pogas atlase"</string>
+ <string name="add_button" msgid="4134946063432258161">"Pievienot pogu"</string>
+ <string name="save" msgid="2311877285724540644">"Saglabāt"</string>
+ <string name="reset" msgid="2448168080964209908">"Atiestatīt"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Netika atrasta poga Sākums"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Navigācijai šajā ierīcē ir nepieciešama poga Sākums. Lūdzu, pirms saglabāšanas pievienojiet pogu Sākums."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Pogas platuma pielāgošana"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Starpliktuve"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Ja ir pieejama starpliktuve, tajā var tieši ievilkt vienumus, kā arī ievietotos vienumus var izvilkt no tās."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Pielāgota navigācijas poga"</string>
+ <string name="keycode" msgid="7335281375728356499">"Taustiņu kods"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Izmantojot taustiņu koda pogas, navigācijas joslai var pievienot tastatūras taustiņus. Nospiežot taustiņu, tiek imitēta atlasītā tastatūras taustiņa funkcija. Vispirms ir jāatlasa taustiņš attiecīgajai pogai, pēc tam ir jāpievieno uz pogas rādāmais attēls."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Tastatūras pogas atlase"</string>
+ <string name="preview" msgid="9077832302472282938">"Priekšskatījums"</string>
</resources>
diff --git a/packages/SystemUI/res/values-lv/strings_tv.xml b/packages/SystemUI/res/values-lv/strings_tv.xml
deleted file mode 100644
index 1c42520..0000000
--- a/packages/SystemUI/res/values-lv/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Aizvērt attēlu attēlā"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Pilnekrāna režīms"</string>
- <string name="pip_play" msgid="674145557658227044">"Atskaņot"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Apturēt"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Atcelt"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Turiet nospiestu taustiņu HOME, lai kontrolētu attēlu attēlā"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-mk-rMK/strings.xml b/packages/SystemUI/res/values-mk-rMK/strings.xml
index 348d679..1c7b94b 100644
--- a/packages/SystemUI/res/values-mk-rMK/strings.xml
+++ b/packages/SystemUI/res/values-mk-rMK/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Нема СИМ картичка."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Мобилните податоци се исклучени"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Се поврзува со Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Режим на работа во авион."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Нема СИМ-картичка"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"прикачување екран"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"пребарај"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> не може да се вклучи."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Повеќе"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Уште <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Историја"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Исчисти"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Раздели хоризонтално"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Раздели вертикално"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Раздели прилагодено"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Нормални бои"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Ноќни бои"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Приспособени бои"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Автоматски"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Непознати бои"</string>
<string name="color_transform" msgid="6985460408079086090">"Промена на бојата"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Прикажи плочка Брзи поставки"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Слушалките се поврзани"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Слушалките се поврзани"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Овозможете или оневозможете прикажување на иконите во статусната лента."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Штедач на интернет"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Штедачот на интернет е вклучен"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Штедачот на интернет е исклучен"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Вклучено"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Лента за навигација"</string>
+ <string name="start" msgid="6873794757232879664">"Почеток"</string>
+ <string name="center" msgid="4327473927066010960">"Центар"</string>
+ <string name="end" msgid="125797972524818282">"Крај"</string>
+ <string name="space" msgid="804232271282109749">"Оддалечувач"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Менување мени/тастатура"</string>
+ <string name="select_button" msgid="1597989540662710653">"Изберете копче за додавање"</string>
+ <string name="add_button" msgid="4134946063432258161">"Додај копче"</string>
+ <string name="save" msgid="2311877285724540644">"Зачувај"</string>
+ <string name="reset" msgid="2448168080964209908">"Ресетирај"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Не е пронајдено копче „Дома“"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Потребно е копче „Дома“ за да може да го движите уредот. Додајте копче „Дома“ пред зачувувањето."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Приспособи ја ширината на копчето"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Табла со исечоци"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Таблата со исечоци овозможува ставките да се довлечат директно на неа. Исто така, ставките може да се извлечат директно од таблата со исечоци кога таа е присутна."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Приспособено копче за навигација"</string>
+ <string name="keycode" msgid="7335281375728356499">"Код од тастери"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Копчињата на кодовите од тастери овозможуваат тастерите на тастатурата да се додадат на лентата за навигација. Кога се притиснати тие го поддржуваат избраниот тастер на тастатурата. Прво мора да се избере тастерот за копчето, по што на копчето се прикажува слика."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Изберете копче за тастатура"</string>
+ <string name="preview" msgid="9077832302472282938">"Преглед"</string>
</resources>
diff --git a/packages/SystemUI/res/values-mk-rMK/strings_tv.xml b/packages/SystemUI/res/values-mk-rMK/strings_tv.xml
deleted file mode 100644
index ce7a13a..0000000
--- a/packages/SystemUI/res/values-mk-rMK/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Затвори ја слика во слика"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Цел екран"</string>
- <string name="pip_play" msgid="674145557658227044">"Пушти"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Пауза"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Откажи"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Задржете ја Почетна страница за да ја контролирате Слика во слика"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-ml-rIN/strings.xml b/packages/SystemUI/res/values-ml-rIN/strings.xml
index a393e42..5cc33b3 100644
--- a/packages/SystemUI/res/values-ml-rIN/strings.xml
+++ b/packages/SystemUI/res/values-ml-rIN/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"വൈഫൈ"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"സിം ഇല്ല."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"സെല്ലുലാർ ഡാറ്റ ഓഫാണ്"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"ബ്ലൂടൂത്ത് ടെതറിംഗ്."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"ഫ്ലൈറ്റ് മോഡ്."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"SIM കാർഡൊന്നുമില്ല."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"സ്ക്രീൻ പിൻ ചെയ്യൽ"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"തിരയുക"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> ആരംഭിക്കാനായില്ല."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"കൂടുതൽ"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> എണ്ണം കൂടി"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"ചരിത്രം"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"മായ്ക്കുക"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"തിരശ്ചീനമായി വേർതിരിക്കുക"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ലംബമായി വേർതിരിക്കുക"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"ഇഷ്ടാനുസൃതമായി വേർതിരിക്കുക"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"സാധാരണ വര്ണ്ണങ്ങൾ"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"രാത്രി വര്ണ്ണങ്ങൾ"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"ഇഷ്ടാനുസൃത വര്ണ്ണങ്ങൾ"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"യാന്ത്രികം"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"തിരിച്ചറിയാനാകാത്ത വർണ്ണങ്ങൾ"</string>
<string name="color_transform" msgid="6985460408079086090">"വർണ്ണ പരിഷ്കരണം"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"ദ്രുത ക്രമീകരണ ടൈൽ കാണിക്കുക"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"ഹെഡ്ഫോണുകൾ കണക്റ്റുചെയ്തു"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"ഹെഡ്സെറ്റ് കണക്റ്റുചെയ്തു"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"സ്റ്റാറ്റസ് ബാറിൽ കാണിക്കുന്നതിൽ നിന്ന് ഐക്കണുകളെ പ്രവർത്തനക്ഷമമാക്കുകയോ പ്രവർത്തനരഹിതമാക്കുകയോ ചെയ്യുക"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"ഡാറ്റ സേവർ"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"ഡാറ്റാ സേവർ ഓണാണ്"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"ഡാറ്റാ സേവർ ഓഫാണ്"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"ഓൺ"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"നാവിഗേഷൻ ബാർ"</string>
+ <string name="start" msgid="6873794757232879664">"ആരംഭിക്കൂ"</string>
+ <string name="center" msgid="4327473927066010960">"മധ്യം"</string>
+ <string name="end" msgid="125797972524818282">"അവസാനിപ്പിക്കുക"</string>
+ <string name="space" msgid="804232271282109749">"സ്പേസർ"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"മെനു / കീബോർഡ് സ്വിച്ചർ"</string>
+ <string name="select_button" msgid="1597989540662710653">"ചേർക്കാൻ, ബട്ടൺ തിരഞ്ഞെടുക്കൂ"</string>
+ <string name="add_button" msgid="4134946063432258161">"ബട്ടൺ ചേർക്കുക"</string>
+ <string name="save" msgid="2311877285724540644">"സംരക്ഷിക്കുക"</string>
+ <string name="reset" msgid="2448168080964209908">"പുനഃസജ്ജമാക്കുക"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"ഒരു ഹോം ബട്ടണും കണ്ടെത്തിയില്ല"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"ഈ ഉപകരണം നാവിഗേറ്റ് ചെയ്യുന്നതിന് ഒരു ഹോം ബട്ടൺ ആവശ്യമാണ്, സംരക്ഷിക്കുന്നതിന് മുമ്പ് ഒരു ഹോം ബട്ടൺ ചേർക്കുക."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"ബട്ടൺ വീതി ക്രമീകരിക്കുക"</string>
+ <string name="clipboard" msgid="1313879395099896312">"ക്ലിപ്പ്ബോർഡ്"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"ഇനങ്ങളെ ക്ലിപ്പ്ബോർഡിലേക്ക് നേരിട്ട് വലിച്ചിടാൻ ക്ലിപ്പ്ബോർഡ് അനുവദിക്കുന്നു. ഇനങ്ങളെ ക്ലിപ്പ്ബോർഡിന് പുറത്തേക്ക് നേരിട്ട് വലിച്ചിടുകയുമാകാം."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"ഇഷ്ടാനുസൃത നാവിഗേഷൻ ബട്ടൺ"</string>
+ <string name="keycode" msgid="7335281375728356499">"കീകോഡ്"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"നാവിഗേഷൻ ബാറിലേക്ക് കീബോർഡ് കീകൾ ചേർക്കുന്നതിനെ കീകോഡ് ബട്ടണുകൾ അനുവദിക്കുന്നു. അമർത്തുമ്പോൾ, തിരഞ്ഞെടുത്ത കീയെ അവ അനുകരിക്കുന്നു. ആദ്യം ബട്ടണിനായി കീ തിരഞ്ഞെടുക്കണം, തുടർന്ന് ബട്ടണിൽ കാണിക്കാനുള്ള ചിത്രം തിരഞ്ഞെടുക്കണം."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"കീബോർഡ് ബട്ടൺ തിരഞ്ഞെടുക്കൂ"</string>
+ <string name="preview" msgid="9077832302472282938">"പ്രിവ്യു നടത്തുക"</string>
</resources>
diff --git a/packages/SystemUI/res/values-ml-rIN/strings_tv.xml b/packages/SystemUI/res/values-ml-rIN/strings_tv.xml
deleted file mode 100644
index 4bb15fb..0000000
--- a/packages/SystemUI/res/values-ml-rIN/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP അടയ്ക്കുക"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"പൂര്ണ്ണ സ്ക്രീന്"</string>
- <string name="pip_play" msgid="674145557658227044">"പ്ലേ ചെയ്യുക"</string>
- <string name="pip_pause" msgid="8412075640017218862">"തൽക്കാലം നിർത്തൂ"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"റദ്ദാക്കുക"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP നിയന്ത്രിക്കാൻ ഹോം പിടിക്കുക"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-mn-rMN/strings.xml b/packages/SystemUI/res/values-mn-rMN/strings.xml
index 9b45994..b8ce3b4 100644
--- a/packages/SystemUI/res/values-mn-rMN/strings.xml
+++ b/packages/SystemUI/res/values-mn-rMN/strings.xml
@@ -144,6 +144,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"SIM байхгүй."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Мобайл датаг унтраасан байна"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Блютүүт модем болж байна."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Нислэгийн горим"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"SIM карт байхгүй."</string>
@@ -298,8 +299,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"дэлгэц тогтоох"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"хайх"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g>-г эхлүүлж чадсангүй."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Илүү"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> Илүү"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Түүх"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Устгах"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Хэвтээ чиглэлд хуваах"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Босоо чиглэлд хуваах"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Хүссэн хэлбэрээр хуваах"</string>
@@ -465,6 +466,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Хэвийн өнгө"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Шөнийн өнгө"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Өгөгдмөл өнгө"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Автомат"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Үл мэдэгдэх өнгө"</string>
<string name="color_transform" msgid="6985460408079086090">"Өнгөний өөрчлөлт"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Түргэн тохиргооны хэсгийг харуулах"</string>
@@ -491,10 +493,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Чихэвч холбогдсон"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Чихэвч холбогдсон"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Статусын самбарт харагдах дүрс тэмдгийг идэвхжүүлэх эсвэл идэвхгүй болгоно уу."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Өгөгдөл хамгаалагч"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Өгөгдөл хамгаалагчийг асаасан байна"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Өгөгдөл хамгаалагчийг унтраасан байна"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Идэвхтэй"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Навигацийн самбар"</string>
+ <string name="start" msgid="6873794757232879664">"Эхлэх"</string>
+ <string name="center" msgid="4327473927066010960">"Гол хэсэг"</string>
+ <string name="end" msgid="125797972524818282">"Төгсгөл"</string>
+ <string name="space" msgid="804232271282109749">"Зай авагч"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Цэс / Гар солигч"</string>
+ <string name="select_button" msgid="1597989540662710653">"Нэмэх товчлуурыг сонгох"</string>
+ <string name="add_button" msgid="4134946063432258161">"Нэмэх товчлуур"</string>
+ <string name="save" msgid="2311877285724540644">"Хадгалах"</string>
+ <string name="reset" msgid="2448168080964209908">"Бүгдийг цэвэрлэх"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Нүүр хуудас товчлуур байхгүй"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Энэ төхөөрөмжийг удирдахын тулд нүүр хуудас товчлуур шаардлагатай байна. Хадгалахын өмнө нүүр хуудасны товчлуур нэмнэ үү."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Товчлуурын өргөнг тохируулах"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Түр санах ой"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Түр санах ой нь аливаа зүйлийг түр санах ойд зөөх боломжийг олгодог. Мөн тухайн зүйлсийг түр санах ойгоос зөөх боломжтой."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Навигацийн товчлуурыг өөрчлөх"</string>
+ <string name="keycode" msgid="7335281375728356499">"Түлхүүр код"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Түлхүүр код товчлуур нь гарын түлхүүрийг навигацийн самбарт нэмэхийг зөвшөөрдөг. Дарсан үед гарын сонгосон товчлуурыг дуурайдаг. Эхлээд товчлуурын түлхүүрийг сонгох шаардлагатай бөгөөд дараа нь зохих зургийг сонгоно."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Гарын товчлуур сонгох"</string>
+ <string name="preview" msgid="9077832302472282938">"Урьдчилж харах"</string>
</resources>
diff --git a/packages/SystemUI/res/values-mn-rMN/strings_tv.xml b/packages/SystemUI/res/values-mn-rMN/strings_tv.xml
deleted file mode 100644
index 04df731..0000000
--- a/packages/SystemUI/res/values-mn-rMN/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP-г хаах"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Бүтэн дэлгэц"</string>
- <string name="pip_play" msgid="674145557658227044">"Тоглуулах"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Түр зогсоох"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Цуцлах"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP-г удирдахын тулд HOME-г дарна уу"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-mr-rIN/strings.xml b/packages/SystemUI/res/values-mr-rIN/strings.xml
index 9329909..bb41693 100644
--- a/packages/SystemUI/res/values-mr-rIN/strings.xml
+++ b/packages/SystemUI/res/values-mr-rIN/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"वाय-फाय"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"सिम नाही."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"मोबाइल डेटा बंद"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"ब्लूटुथ टिथरिंग."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"विमान मोड."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"सिम कार्ड नाही."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"स्क्रीन पिन करणे"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"शोधा"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> प्रारंभ करणे शक्य झाले नाही."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"अधिक"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"आणखी <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"इतिहास"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"साफ करा"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"क्षैतिज विभाजित करा"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"अनुलंब विभाजित करा"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"सानुकूल विभाजित करा"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"सामान्य रंग"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"रात्रीचे रंग"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"सानुकूल रंग"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"स्वयं"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"अज्ञात रंग"</string>
<string name="color_transform" msgid="6985460408079086090">"रंग सुधारणा"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"द्रुत सेटिंग्ज टाइल दर्शवा"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"हेडफोन कनेक्ट केले"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"हेडसेट कनेक्ट केला"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"चिन्हे स्टेटस बारमध्ये दर्शविले जाण्यापासून प्रतिबंधित करण्यासाठी ती सक्षम किंवा अक्षम करा."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"डेटा बचतकर्ता"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"डेटा बचतकर्ता चालू आहे"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"डेटा बचतकर्ता बंद आहे"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"चालू"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"नॅव्हिगेशन बार"</string>
+ <string name="start" msgid="6873794757232879664">"प्रारंभ"</string>
+ <string name="center" msgid="4327473927066010960">"मध्यवर्ती"</string>
+ <string name="end" msgid="125797972524818282">"समाप्ती"</string>
+ <string name="space" msgid="804232271282109749">"स्पेसर"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"मेनू / कीबोर्ड स्विचर"</string>
+ <string name="select_button" msgid="1597989540662710653">"जोडण्यासाठी बटण निवडा"</string>
+ <string name="add_button" msgid="4134946063432258161">"बटण जोडा"</string>
+ <string name="save" msgid="2311877285724540644">"जतन करा"</string>
+ <string name="reset" msgid="2448168080964209908">"रीसेट करा"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"मुख्यपृष्ठ बटण आढळले नाही"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"हे डिव्हाइस नेव्हिगेट करण्यासाठी मुख्यपृष्ठ बटण सक्षम असणे आवश्यक आहे. कृपया जतन करण्यापूर्वी एक मुख्यपृष्ठ बटण जोडा."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"बटण रूंदी समायोजित करा"</string>
+ <string name="clipboard" msgid="1313879395099896312">"क्लिपबोर्ड"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"थेट क्लिपबोर्डवर ड्रॅग केले जाण्यासाठी क्लिपबोर्ड आयटमना अनुमती देते. क्लिपबोर्डवर आयटम असताना ते थेट क्लिपबोर्ड बाहेर देखील ड्रॅग केले जाऊ शकतात."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"सानुकूल नेव्हिगेशन बटण"</string>
+ <string name="keycode" msgid="7335281375728356499">"कीकोड"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"कीकोड बटणे नेव्हिगेशन बारमध्ये कीबोर्ड की ना जोडण्यासाठी अनुमती देतात. दाबल्यानंतर ते निवडलेल्या कीबोर्ड की चे अनुकरण करतात. बटणासाठी प्रथम की त्यानंतर बटणावर दर्शविली जाण्यासाठी प्रतिमा निवडणे आवश्यक आहे."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"कीबोर्ड बटण निवडा"</string>
+ <string name="preview" msgid="9077832302472282938">"पूर्वावलोकन"</string>
</resources>
diff --git a/packages/SystemUI/res/values-mr-rIN/strings_tv.xml b/packages/SystemUI/res/values-mr-rIN/strings_tv.xml
deleted file mode 100644
index 021f34c..0000000
--- a/packages/SystemUI/res/values-mr-rIN/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP बंद करा"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"पूर्ण स्क्रीन"</string>
- <string name="pip_play" msgid="674145557658227044">"प्ले करा"</string>
- <string name="pip_pause" msgid="8412075640017218862">"विराम द्या"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"रद्द करा"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP नियंत्रित करण्यासाठी मुख्यपृष्ठ धरून ठेवा"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-ms-rMY/strings.xml b/packages/SystemUI/res/values-ms-rMY/strings.xml
index a4e90c0..2f2a238 100644
--- a/packages/SystemUI/res/values-ms-rMY/strings.xml
+++ b/packages/SystemUI/res/values-ms-rMY/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Tiada SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Data Selular Dimatikan"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Penambatan Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Mod pesawat"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Tiada kad SIM."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"penyematan skrin"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"cari"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Tidak dapat memulakan <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Lagi"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> Lagi"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Sejarah"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Kosongkan"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Mendatar Terpisah"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Menegak Terpisah"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Tersuai Terpisah"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Warna biasa"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Warna malam"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Warna tersuai"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Auto"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Warna tidak diketahui"</string>
<string name="color_transform" msgid="6985460408079086090">"Pengubahsuaian warna"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Tunjukkan jubin Tetapan Pantas"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Fon kepala disambungkan"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Set kepala disambungkan"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Dayakan atau lumpuhkan ikon daripada dipaparkan dalam bar status."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Penjimat Data"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Penjimat Data dihidupkan"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Penjimat Data dimatikan"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Hidup"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Bar navigasi"</string>
+ <string name="start" msgid="6873794757232879664">"Mula"</string>
+ <string name="center" msgid="4327473927066010960">"Tengah"</string>
+ <string name="end" msgid="125797972524818282">"Tamat"</string>
+ <string name="space" msgid="804232271282109749">"Peruang"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Penukar Menu/Papan Kekunci"</string>
+ <string name="select_button" msgid="1597989540662710653">"Pilih butang untuk ditambahkan"</string>
+ <string name="add_button" msgid="4134946063432258161">"Tambahkan butang"</string>
+ <string name="save" msgid="2311877285724540644">"Simpan"</string>
+ <string name="reset" msgid="2448168080964209908">"Tetapkan semula"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Butang laman utama tdk ditemui"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Butang laman utama diperlukan untuk menavigasi peranti ini. Sila tambahkan butang laman utama sebelum menyimpan."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Laraskan lebar butang"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Papan Keratan"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Papan Keratan membolehkan item diseret secara langsung ke papan keratan. Jika terdapat item pada papan keratan, item itu boleh diseret keluar daripada papan keratan juga."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Butang navigasi tersuai"</string>
+ <string name="keycode" msgid="7335281375728356499">"Kod Kunci"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Butang Kod Kunci membolehkan kunci papan kekunci ditambahkan pada Bar Navigasi. Apabila ditekan, butang ini meniru kunci papan kekunci yang dipilih. Mula-mula, kunci mesti dipilih untuk butang tersebut, diikuti dengan imej yang hendak dipaparkan pada butang."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Pilih Butang Papan Kekunci"</string>
+ <string name="preview" msgid="9077832302472282938">"Pratonton"</string>
</resources>
diff --git a/packages/SystemUI/res/values-ms-rMY/strings_tv.xml b/packages/SystemUI/res/values-ms-rMY/strings_tv.xml
deleted file mode 100644
index 850910b..0000000
--- a/packages/SystemUI/res/values-ms-rMY/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Tutup PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Skrin penuh"</string>
- <string name="pip_play" msgid="674145557658227044">"Main"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Jeda"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Batal"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Tahan kekunci HOME untuk mengawal PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-my-rMM/strings.xml b/packages/SystemUI/res/values-my-rMM/strings.xml
index cfcc15ab..32003bf 100644
--- a/packages/SystemUI/res/values-my-rMM/strings.xml
+++ b/packages/SystemUI/res/values-my-rMM/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"ဝိုင်ဖိုင်"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"ဆင်းကဒ်မရှိပါ။"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"ဆဲလ်လူလာဒေတာပိတ်ထားသည်"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"ဘလူးတုသ်မှတဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"လေယာဥ်ပျံပေါ်အသုံးပြုသောစနစ်။"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"SIM ကဒ် မရှိပါ"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"မျက်နှာပြင် ပင်ထိုးမှု"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ရှာဖွေရန်"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> ကို မစနိုင်ပါ။"</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"နောက်ထပ်"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"နောက်ထပ် <xliff:g id="NUMBER">%d</xliff:g> ခု"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"မှတ်တမ်း"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"ရှင်းလင်းပါ"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ရေပြင်ညီ ပိုင်းမည်"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ဒေါင်လိုက်ပိုင်းမည်"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"စိတ်ကြိုက် ပိုင်းမည်"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"ပုံမှန် အရောင်များ"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"ည အရောင်များ"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"စိတ်ကြိုက် အရောင်များ"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"အလိုအလျောက်"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"မသိသည့် အရောင်များ"</string>
<string name="color_transform" msgid="6985460408079086090">"အရောင် မွမ်းမံမှု"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"အမြန် ဆက်တင် လေးထောင့်ကွက်ကို ပြပါ"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"နားကြပ်တပ်ဆင်ပြီးပါပြီ"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"မိုက်ခွက်ပါနားကြပ်တပ်ဆင်ပြီးပါပြီ"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"အခြေအနေဘားတန်းတွင် သင်္ကေတပုံပြခြင်းကို ဖွင့်ရန် သို့မဟုတ် ပိတ်ရန်"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"ဒေတာချွေတာမှု"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"ဒေတာချွေတာမှု ဖွင့်ထားသည်"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"ဒေတာချွေတာမှု ပိတ်ထားသည်"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"ဖွင့်ပါ"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"ရွှေ့လျားရန်ဘားတန်း"</string>
+ <string name="start" msgid="6873794757232879664">"စတင်ပါ"</string>
+ <string name="center" msgid="4327473927066010960">"ဌာန"</string>
+ <string name="end" msgid="125797972524818282">"ပြီးပါပြီ"</string>
+ <string name="space" msgid="804232271282109749">"နေရာလွတ်ခြားစနစ်"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"မန်နယူး / ကီးဘုတ်ပြောင်းစနစ်"</string>
+ <string name="select_button" msgid="1597989540662710653">"ပေါင်းထည့်ရန် ခလုတ်ကိုရွေးပါ"</string>
+ <string name="add_button" msgid="4134946063432258161">"ခလုတ်ပေါင်းထည့်ပါ"</string>
+ <string name="save" msgid="2311877285724540644">"သိမ်းဆည်းပါ"</string>
+ <string name="reset" msgid="2448168080964209908">"ပြန်လည်စတင်စေရန်"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"ပင်မခလုတ်မတွေ့ပါ"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"ဤစက်ပစ္စည်းကိုရွှေ့လျားနိုင်ရန် ပင်မခလုတ် လိုအပ်ပါသည်။ မသိမ်းဆည်းမီ ပင်မခလုတ်ကို ပေါင်းထည့်ပါ။"</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"ခလုတ်အလျားကို ချိန်ညှိပါ"</string>
+ <string name="clipboard" msgid="1313879395099896312">"ကလစ်ဘုတ်"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"ကလစ်ဘုတ်သည် အရာဝတ္တုများကို ကလစ်ဘုတ်သို့တိုက်ရိုက် ဆွဲသွင်းရန်ခွင့်ပြုပါသည်။ အရာဝတ္တုများရှိနေလျှင်လည်း ကလစ်ဘုတ်၏အပြင်သို့ ၎င်းတို့ကိုတိုက်ရိုက် ဆွဲထုတ်နိုင်သည်။"</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"စိတ်ကြိုက်ရွှေ့လျားရန် ခလုတ်"</string>
+ <string name="keycode" msgid="7335281375728356499">"ကီးကုဒ်"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"ကီးကုဒ်ခလုတ်များသည် ကီးဘုတ်ခလုတ်များကို ရွှေ့လျားရန်ဘားတန်းသို့ ပေါင်းထည့်ရန်ခွင့်ပြုသည်။ နှိပ်လိုက်လျှင် ၎င်းသည် ရွေးချယ်ထားသည့် ကီးဘုတ်ခလုတ်အတိုင်း လုပ်ဆောင်ပါသည်။ ပထမဦးစွာ ခလုတ်အတွက် ကီးကိုရွေးချယ်ပြီး ခလုတ်ပေါ်တွင် ပြမည့်ပုံကို ဆက်လက်ရွေးချယ်ရပါမည်။"</string>
+ <string name="select_keycode" msgid="7413765103381924584">"ကီးဘုတ်ခလုတ်ကို ရွေးချယ်ပါ"</string>
+ <string name="preview" msgid="9077832302472282938">"အစမ်းကြည့်ပါ"</string>
</resources>
diff --git a/packages/SystemUI/res/values-my-rMM/strings_tv.xml b/packages/SystemUI/res/values-my-rMM/strings_tv.xml
deleted file mode 100644
index 98d05a9..0000000
--- a/packages/SystemUI/res/values-my-rMM/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP ကို ပိတ်ပါ"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"မျက်နှာပြင် အပြည့်"</string>
- <string name="pip_play" msgid="674145557658227044">"ဖွင့်ပါ"</string>
- <string name="pip_pause" msgid="8412075640017218862">"ဆိုင်းငံ့ပါ"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"ဖျက်သိမ်းပါ"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP ကို ထိန်းချုပ်ရန် HOME ကို ကိုင်ထားပါ"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml
index 377642b..f88445f 100644
--- a/packages/SystemUI/res/values-nb/strings.xml
+++ b/packages/SystemUI/res/values-nb/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Uten SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobildata er av"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth-internettdeling."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Flymodus."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Mangler SIM-kort."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"én-appsmodus"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"Søk"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Kunne ikke starte <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Mer"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> til"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Logg"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Tøm"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Del horisontalt"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Del vertikalt"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Del tilpasset"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Normale farger"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Nattfarger"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Spesialtilpassede farger"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automatisk"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Ukjente farger"</string>
<string name="color_transform" msgid="6985460408079086090">"Fargemodifisering"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Vis ruten for hurtiginnstillinger"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Øretelefoner er tilkoblet"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Hodetelefoner er tilkoblet"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Vis eller skjul ikoner i statusfeltet."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Datasparing"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Datasparing er på"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Datasparing er av"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"På"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigasjonsrad"</string>
+ <string name="start" msgid="6873794757232879664">"Start"</string>
+ <string name="center" msgid="4327473927066010960">"Midtstilt"</string>
+ <string name="end" msgid="125797972524818282">"Slutt"</string>
+ <string name="space" msgid="804232271282109749">"Mellomrom"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Bytteknapp for meny/tastatur"</string>
+ <string name="select_button" msgid="1597989540662710653">"Velg en knapp du vil legge til"</string>
+ <string name="add_button" msgid="4134946063432258161">"Legg til knapp"</string>
+ <string name="save" msgid="2311877285724540644">"Lagre"</string>
+ <string name="reset" msgid="2448168080964209908">"Tilbakestill"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Fant ingen startsideknapp"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Det kreves en startsideknapp for å kunne navigere på denne enheten. Legg til en startsideknapp før du lagrer."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Juster bredden på knappen"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Utklippstavle"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Med Clipboard-funksjonen kan elementer dras direkte til utklippstavlen. Hvis det finnes elementer på utklippstavlen, kan de også dras ut derfra."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Spesialtilpasset navigasjonsknapp"</string>
+ <string name="keycode" msgid="7335281375728356499">"Nøkkelkode"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Du kan bruke nøkkelkodeknapper for å legge tastaturtaster direkte på navigasjonsraden. Når du trykker på disse knappene, fungerer de på samme måte som de valgte tastaturtastene. Du må først velge hvilken tast hver knapp skal fungere som, og deretter et bilde som vises på knappen."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Velg tastaturtast"</string>
+ <string name="preview" msgid="9077832302472282938">"Forhåndsvisning"</string>
</resources>
diff --git a/packages/SystemUI/res/values-nb/strings_tv.xml b/packages/SystemUI/res/values-nb/strings_tv.xml
deleted file mode 100644
index ba191a4..0000000
--- a/packages/SystemUI/res/values-nb/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Lukk PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Fullskjerm"</string>
- <string name="pip_play" msgid="674145557658227044">"Spill av"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Sett på pause"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Avbryt"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Hold inne STARTSIDEN for å kontrollere PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-ne-rNP/strings.xml b/packages/SystemUI/res/values-ne-rNP/strings.xml
index 2a15c87..a0faf75 100644
--- a/packages/SystemUI/res/values-ne-rNP/strings.xml
+++ b/packages/SystemUI/res/values-ne-rNP/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"वाइफाइ"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"SIM छैन।"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"सेलुलर डेटा अफ छ"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"ब्लुटुथ टेदर गर्दै।"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"हवाइजहाज मोड।"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"SIM कार्ड छैन।"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"स्क्रिन पिन गर्दै"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"खोजी गर्नुहोस्"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"सुरु गर्न सकिएन <xliff:g id="APP">%s</xliff:g>।"</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"थप"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> थप"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"इतिहास"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"मेटाउनुहोस्"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"तेर्सो रूपमा विभाजन गर्नुहोस्"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ठाडो रूपमा विभाजन गर्नुहोस्"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"अनुकूलन विभाजन गर्नुहोस्"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"सामान्य रङहरू"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"रात्री रङहरू"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"अनुकूलन रङहरू"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"स्वतः"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"अज्ञात रङहरू"</string>
<string name="color_transform" msgid="6985460408079086090">"रङ परिमार्जन"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"द्रुत सेटिङ टाइल देखाउनुहोस्"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"हेडफोनहरू जडान गरियो"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"हेडसेट जडान गरियो"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"वस्तुस्थिति पट्टीमा देखाइनको लागि आइकनहरू सक्रिय वा निष्क्रिय गर्नुहोस्।"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"डेटा सेभर"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"डेटा सेभर अन छ"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"डेटा सेभर बन्द छ"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"सक्रिय गर्नुहोस्"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"नेभिगेसन पट्टी"</string>
+ <string name="start" msgid="6873794757232879664">"सुरु गर्नुहोस्"</string>
+ <string name="center" msgid="4327473927066010960">"केन्द्र"</string>
+ <string name="end" msgid="125797972524818282">"अन्त्य गर्नुहोस्"</string>
+ <string name="space" msgid="804232271282109749">"स्पेसर"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"मेनु / किबोर्ड स्विचर"</string>
+ <string name="select_button" msgid="1597989540662710653">"थप्नका लागि बटन चयन गर्नुहोस्"</string>
+ <string name="add_button" msgid="4134946063432258161">"बटन थप्नुहोस्"</string>
+ <string name="save" msgid="2311877285724540644">"सुरक्षित गर्नुहोस्"</string>
+ <string name="reset" msgid="2448168080964209908">"पुनःसेट गर्नु"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"गृह बटन फेला परेन"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"यस यन्त्रलाई नेभिगेट गर्न सक्षम हुन गृह बटन आवश्यक छ। कृपया सुरक्षित गर्नु पूर्व गृह बटन थप्नुहोस्।"</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"बटनको चौडाइ समायोजन गर्नुहोस्"</string>
+ <string name="clipboard" msgid="1313879395099896312">"क्लिपबोर्ड"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"क्लिपबोर्डले वस्तुहरूलाई क्लिपबोर्डमा प्रत्यक्ष तान्न अनुमति दिन्छ। प्रस्तुत गर्दा वस्तुहरूलाई क्लिपबोर्डबाट प्रत्यक्ष रूपमा बाहिर तान्न पनि सकिन्छ।"</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"अनुकूलन नेभिगेशन बटन"</string>
+ <string name="keycode" msgid="7335281375728356499">"Keycode"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Keycode बटनहरूले किबोर्ड कुञ्जीहरूलाई नेभिगेसन पट्टीमा थपिने अनुमति दिन्छ। थिच्दा तिनीहरूले चयन गरिएको किबोर्ड कुञ्जी अनुकरण गर्छन्। सुरुमा बटनका लागि कुञ्जी चयन गर्नुपर्छ, त्यसपछि बटनमा छवि देखिनुपर्छ।"</string>
+ <string name="select_keycode" msgid="7413765103381924584">"किबोर्ड बटन चयन गर्नुहोस्"</string>
+ <string name="preview" msgid="9077832302472282938">"पूर्वावलोकन"</string>
</resources>
diff --git a/packages/SystemUI/res/values-ne-rNP/strings_tv.xml b/packages/SystemUI/res/values-ne-rNP/strings_tv.xml
deleted file mode 100644
index 09cc01d..0000000
--- a/packages/SystemUI/res/values-ne-rNP/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP बन्द गर्नुहोस्"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"पूर्ण स्क्रिन"</string>
- <string name="pip_play" msgid="674145557658227044">"प्ले गर्नुहोस्"</string>
- <string name="pip_pause" msgid="8412075640017218862">"रोक्नुहोस्"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"रद्द गर्नुहोस्"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP नियन्त्रण गर्न HOME थिचिरहनुहोस्"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml
index 3e91b5c..814a1a8 100644
--- a/packages/SystemUI/res/values-nl/strings.xml
+++ b/packages/SystemUI/res/values-nl/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wifi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Geen simkaart."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobiele data uit"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth-tethering."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Vliegtuigmodus."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Geen simkaart."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"scherm vastzetten"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"zoeken"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Kan <xliff:g id="APP">%s</xliff:g> niet starten."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Meer"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Nog <xliff:g id="NUMBER">%d</xliff:g> andere"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Geschiedenis"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Wissen"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Horizontaal splitsen"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Verticaal splitsen"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Aangepast splitsen"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Normale kleuren"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Nachtkleuren"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Aangepaste kleuren"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automatisch"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Onbekende kleuren"</string>
<string name="color_transform" msgid="6985460408079086090">"Kleuraanpassing"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Tegel voor \'Snelle instellingen\' weergeven"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Hoofdtelefoon aangesloten"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Headset aangesloten"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"De weergave van pictogrammen in de statusbalk in- of uitschakelen."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Databesparing"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Databesparing is ingeschakeld"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Databesparing is uitgeschakeld"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Aan"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigatiebalk"</string>
+ <string name="start" msgid="6873794757232879664">"Begin"</string>
+ <string name="center" msgid="4327473927066010960">"Midden"</string>
+ <string name="end" msgid="125797972524818282">"Einde"</string>
+ <string name="space" msgid="804232271282109749">"Opvulling"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menu/toetsenbord-schakelaar"</string>
+ <string name="select_button" msgid="1597989540662710653">"Knop kiezen om toe te voegen"</string>
+ <string name="add_button" msgid="4134946063432258161">"Knop toevoegen"</string>
+ <string name="save" msgid="2311877285724540644">"Opslaan"</string>
+ <string name="reset" msgid="2448168080964209908">"Resetten"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Geen startknop gevonden"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Er is een startknop vereist om te navigeren op dit apparaat. Voeg een startknop toe voordat je opslaat."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Breedte van knop aanpassen"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Klembord"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Met Klembord kunnen items rechtstreeks naar het klembord worden gesleept. Indien aanwezig, kunnen items ook rechtstreeks van het klembord worden gesleept."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Aangepaste navigatieknop"</string>
+ <string name="keycode" msgid="7335281375728356499">"Toetscode"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Met toetscodeknoppen kunnen toetsenbordtoetsen worden toegevoegd aan de navigatiebalk. Wanneer hierop wordt gedrukt, emuleren ze de geselecteerde toetsenbordtoets. Eerst moet de toets voor de knop worden geselecteerd, gevolgd door een afbeelding die wordt weergegeven op de knop."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Toetsenbordknop selecteren"</string>
+ <string name="preview" msgid="9077832302472282938">"Voorbeeld"</string>
</resources>
diff --git a/packages/SystemUI/res/values-nl/strings_tv.xml b/packages/SystemUI/res/values-nl/strings_tv.xml
deleted file mode 100644
index 59c711d..0000000
--- a/packages/SystemUI/res/values-nl/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP sluiten"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Volledig scherm"</string>
- <string name="pip_play" msgid="674145557658227044">"Afspelen"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Onderbreken"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Annuleren"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Houd HOME ingedrukt om PIP te bedienen"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-pa-rIN/strings.xml b/packages/SystemUI/res/values-pa-rIN/strings.xml
index 1c98369..d83de21 100644
--- a/packages/SystemUI/res/values-pa-rIN/strings.xml
+++ b/packages/SystemUI/res/values-pa-rIN/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"ਕਿਨਾਰਾ"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"ਕੋਈ SIM ਨਹੀਂ।"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"ਸੈਲਿਊਲਰ ਡੈਟਾ ਬੰਦ ਹੈ"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth ਟੀਥਰਿੰਗ।"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"ਏਅਰਪਲੇਨ ਮੋਡ।"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"ਕੋਈ SIM ਕਾਰਡ ਨਹੀਂ।"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ਸਕ੍ਰੀਨ ਪਿਨਿੰਗ"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ਖੋਜੋ"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> ਨੂੰ ਚਾਲੂ ਨਹੀਂ ਕਰ ਸਕਿਆ।"</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"ਹੋਰ"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> ਹੋਰ"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"ਇਤਿਹਾਸ"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"ਸਾਫ਼ ਕਰੋ"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ਹੌਰੀਜ਼ੌਂਟਲ ਸਪਲਿਟ"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ਵਰਟੀਕਲ ਸਪਲਿਟ"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"ਕਸਟਮ ਸਪਲਿਟ"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"ਸਧਾਰਨ ਰੰਗ"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"ਰਾਤ ਦੇ ਰੰਗ"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"ਕਸਟਮ ਰੰਗ"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"ਸਵੈ"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"ਅਗਿਆਤ ਰੰਗ"</string>
<string name="color_transform" msgid="6985460408079086090">"ਰੰਗ ਸੋਧ"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਟਾਇਲ ਵਿਖਾਓ"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"ਹੈੱਡਫੋਨਾਂ ਨੂੰ ਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"ਹੈੱਡਸੈੱਟ ਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"ਚਿੰਨ੍ਹਾਂ ਦੇ ਸਥਿਤੀ ਪੱਟੀ ਵਿੱਚ ਵਿਖਾਏ ਜਾਣ ਨੂੰ ਯੋਗ ਜਾਂ ਅਯੋਗ ਬਣਾਓ।"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"ਡੈਟਾ ਸੇਵਰ"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"ਡੈਟਾ ਸੇਵਰ ਚਾਲੂ ਹੈ"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"ਡੈਟਾ ਸੇਵਰ ਬੰਦ ਹੈ"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"ਚਾਲੂ"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"ਆਵਾਗੌਣ ਪੱਟੀ"</string>
+ <string name="start" msgid="6873794757232879664">"ਸ਼ੁਰੂ ਕਰੋ"</string>
+ <string name="center" msgid="4327473927066010960">"ਕੇਂਦਰ"</string>
+ <string name="end" msgid="125797972524818282">"ਸਮਾਪਤ"</string>
+ <string name="space" msgid="804232271282109749">"ਸਪੇਸਰ"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"ਮੀਨੂ/ਕੀ-ਬੋਰਡ ਸਵਿੱਚਰ"</string>
+ <string name="select_button" msgid="1597989540662710653">"ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਬਟਨ ਚੁਣੋ"</string>
+ <string name="add_button" msgid="4134946063432258161">"ਬਟਨ ਸ਼ਾਮਲ ਕਰੋ"</string>
+ <string name="save" msgid="2311877285724540644">"ਰੱਖਿਅਤ ਕਰੋ"</string>
+ <string name="reset" msgid="2448168080964209908">"ਰੀਸੈਟ ਕਰੋ"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"ਕੋਈ ਹੋਮ ਬਟਨ ਨਹੀਂ ਮਿਲਿਆ"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"ਇਸ ਡੀਵਾਈਸ ਵਿੱਚ ਆਵਾਗੌਣ ਕਰਨ ਲਈ ਇੱਕ ਹੋਮ ਬਟਨ ਦੀ ਲੋੜ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਰੱਖਿਅਤ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਇੱਕ ਹੋਮ ਬਟਨ ਸ਼ਾਮਲ ਕਰੋ।"</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"ਬਟਨ ਚੁੜਾਈ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
+ <string name="clipboard" msgid="1313879395099896312">"ਕਲਿੱਪਬੋਰਡ"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"ਕਲਿੱਪਬੋਰਡ ਆਈਟਮਾਂ ਨੂੰ ਸਿੱਧੇ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਘਸੀਟਣ ਦਿੰਦਾ ਹੈ। ਮੌਜੂਦ ਹੋਣ \'ਤੇ ਆਈਟਮਾਂ ਸਿੱਧੇ ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਬਾਹਰ ਵੀ ਘਸੀਟੀਆਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।"</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਆਵਾਗੌਣ ਬਟਨ"</string>
+ <string name="keycode" msgid="7335281375728356499">"ਕੀਕੋਡ"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"ਕੀਕੋਡ ਬਟਨ ਕੀ-ਬੋਰਡ ਕੁੰਜੀਆਂ ਨੂੰ ਆਵਾਗੌਣ ਪੱਟੀ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨ ਦਿੰਦੇ ਹਨ। ਦਬਾਏ ਜਾਣ \'ਤੇ ਇਹ ਚੁਣੀਆਂ ਗਈਆਂ ਕੀ-ਬੋਰਡ ਕੁੰਜੀਆਂ ਨੂੰ ਇਮੂਲੇਟ ਕਰਦੇ ਹਨ। ਬਟਨ \'ਤੇ ਵਿਖਾਈ ਜਾਣ ਵਾਲੀ ਤਸਵੀਰ ਦਾ ਅਨੁਸਰਣ ਕਰਦੇ ਹੋਏ, ਪਹਿਲਾਂ ਬਟਨ ਲਈ ਇੱਕ ਕੁੰਜੀ ਨੂੰ ਚੁਣਿਆ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ।"</string>
+ <string name="select_keycode" msgid="7413765103381924584">"ਕੀ-ਬੋਰਡ ਬਟਨ ਚੁਣੋ"</string>
+ <string name="preview" msgid="9077832302472282938">"ਝਲਕ"</string>
</resources>
diff --git a/packages/SystemUI/res/values-pa-rIN/strings_tv.xml b/packages/SystemUI/res/values-pa-rIN/strings_tv.xml
deleted file mode 100644
index 26cc94a..0000000
--- a/packages/SystemUI/res/values-pa-rIN/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP ਬੰਦ ਕਰੋ"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"ਪੂਰੀ ਸਕ੍ਰੀਨ"</string>
- <string name="pip_play" msgid="674145557658227044">"ਚਲਾਓ"</string>
- <string name="pip_pause" msgid="8412075640017218862">"ਰੋਕੋ"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"ਰੱਦ ਕਰੋ"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਲਈ ਹੋਮ ਨੂੰ ਹੋਲਡ ਕਰੋ"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml
index fde806b..728b6da 100644
--- a/packages/SystemUI/res/values-pl/strings.xml
+++ b/packages/SystemUI/res/values-pl/strings.xml
@@ -148,6 +148,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Brak karty SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Komórkowa transmisja danych jest wyłączona"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Powiązanie Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Tryb samolotowy."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Brak karty SIM."</string>
@@ -302,8 +303,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"przypinanie ekranu"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"szukaj"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Nie udało się uruchomić aplikacji <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Więcej"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"i jeszcze <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Historia"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Wyczyść"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Podziel poziomo"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Podziel pionowo"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Podziel niestandardowo"</string>
@@ -469,6 +470,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Kolory standardowe"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Kolory nocne"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Kolory niestandardowe"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automatycznie"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Nieznane kolory"</string>
<string name="color_transform" msgid="6985460408079086090">"Zmiana koloru"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Pokazuj kafelek szybkich ustawień"</string>
@@ -495,10 +497,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Słuchawki są podłączone"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Zestaw słuchawkowy jest podłączony"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Włącz lub wyłącz wyświetlanie ikon na pasku stanu."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Oszczędzanie danych"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Oszczędzanie danych jest włączone"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Oszczędzanie danych jest wyłączone"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Wł."</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Pasek nawigacji"</string>
+ <string name="start" msgid="6873794757232879664">"Na początku"</string>
+ <string name="center" msgid="4327473927066010960">"Na środku"</string>
+ <string name="end" msgid="125797972524818282">"Na końcu"</string>
+ <string name="space" msgid="804232271282109749">"Spacja"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menu / przełączanie klawiatury"</string>
+ <string name="select_button" msgid="1597989540662710653">"Wybierz przycisk do dodania"</string>
+ <string name="add_button" msgid="4134946063432258161">"Dodaj przycisk"</string>
+ <string name="save" msgid="2311877285724540644">"Zapisz"</string>
+ <string name="reset" msgid="2448168080964209908">"Resetuj"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Brak przycisku ekranu głównego"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Do prawidłowej obsługi urządzenia potrzebny jest przycisk ekranu głównego. Dodaj go, zanim zapiszesz zmiany."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Regulacja szerokości przycisku"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Schowek"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Możesz przeciągać elementy bezpośrednio do schowka. Możesz też przeciągać umieszczone tam wcześniej elementy poza schowek."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Niestandardowy przycisk nawigacji"</string>
+ <string name="keycode" msgid="7335281375728356499">"Klawisz"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Na pasku nawigacji możesz umieszczać przyciski, które po naciśnięciu emulują funkcje klawiszy klawiatury. Najpierw musisz wybrać, jaki klawisz ma być przypisany do danego przycisku, a następnie wybrać dla niego grafikę."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Wybierz przycisk klawiatury"</string>
+ <string name="preview" msgid="9077832302472282938">"Podgląd"</string>
</resources>
diff --git a/packages/SystemUI/res/values-pl/strings_tv.xml b/packages/SystemUI/res/values-pl/strings_tv.xml
deleted file mode 100644
index 270ef86..0000000
--- a/packages/SystemUI/res/values-pl/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Zamknij PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Pełny ekran"</string>
- <string name="pip_play" msgid="674145557658227044">"Odtwórz"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Wstrzymaj"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Anuluj"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Przytrzymaj przycisk STRONA GŁÓWNA, by sterować PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml
index 38a6b79..c2fd0d1d 100644
--- a/packages/SystemUI/res/values-pt-rBR/strings.xml
+++ b/packages/SystemUI/res/values-pt-rBR/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Sem SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Dados da rede celular desativados"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Tethering Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Modo avião."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Sem cartão SIM."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixação de tela"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"pesquisar"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Não foi possível iniciar <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Mais"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Mais <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Histórico"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Limpar"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divisão horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divisão vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divisão personalizada"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Cores normais"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Cores noturnas"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Cores personalizadas"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automáticas"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Cores desconhecidas"</string>
<string name="color_transform" msgid="6985460408079086090">"Modificação de cor"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Mostrar bloco de configurações rápidas"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Fones de ouvido conectados"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Fone de ouvido conectado"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Ativar ou desativar a exibição de ícones na barra de status."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Economia de dados"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Economia de dados ativada"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"A Economia de dados está desativada"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Ativado"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Barra de navegação"</string>
+ <string name="start" msgid="6873794757232879664">"Iniciar"</string>
+ <string name="center" msgid="4327473927066010960">"Centralizar"</string>
+ <string name="end" msgid="125797972524818282">"Fim"</string>
+ <string name="space" msgid="804232271282109749">"Espaçador"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Alternador de teclado / menu"</string>
+ <string name="select_button" msgid="1597989540662710653">"Selecione o botão p/ adicionar"</string>
+ <string name="add_button" msgid="4134946063432258161">"Adicionar botão"</string>
+ <string name="save" msgid="2311877285724540644">"Salvar"</string>
+ <string name="reset" msgid="2448168080964209908">"Redefinir"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Nenhum botão de início encontrado"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"É necessário um botão de início para navegar neste dispositivo. Adicione um botão de início antes de salvar."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Ajustar largura do botão"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Prancheta"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"A Prancheta permite que itens sejam arrastados diretamente para a área de transferência. Também é possível arrastar os itens diretamente para fora da área de transferência, quando estiver presente."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Botão de navegação personalizado"</string>
+ <string name="keycode" msgid="7335281375728356499">"Código de tecla"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Os botões de código de tecla permitem que as teclas do teclado sejam adicionadas à barra de navegação. Quando pressionados, eles emulam a tecla selecionada. Primeiro, a tecla deve ser selecionada para o botão, seguida de uma imagem a ser exibida no botão."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Escolha um botão do teclado"</string>
+ <string name="preview" msgid="9077832302472282938">"Visualização"</string>
</resources>
diff --git a/packages/SystemUI/res/values-pt-rBR/strings_tv.xml b/packages/SystemUI/res/values-pt-rBR/strings_tv.xml
deleted file mode 100644
index 131507c..0000000
--- a/packages/SystemUI/res/values-pt-rBR/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Fechar PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Tela cheia"</string>
- <string name="pip_play" msgid="674145557658227044">"Reproduzir"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pausar"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Cancelar"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Mantenha \"PÁGINA INICIAL\" pressionado para controlar o PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml
index 7e66dcf..41ba4bc 100644
--- a/packages/SystemUI/res/values-pt-rPT/strings.xml
+++ b/packages/SystemUI/res/values-pt-rPT/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Sem SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Dados móveis desativados"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Ligação Bluetooth via telemóvel."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Modo de avião"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Nenhum cartão SIM."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixação no ecrã"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"pesquisar"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Não foi possível iniciar o <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Mais"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Mais <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Histórico"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Limpar"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divisão horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divisão vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divisão personalizada"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Cores normais"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Cores noturnas"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Cores personalizadas"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automáticas"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Cores desconhecidas"</string>
<string name="color_transform" msgid="6985460408079086090">"Modificação de cor"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Mostrar o mosaico de Definições rápidas"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Auscultadores ligados"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Auscultadores com microfone integrado ligados"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Ativar ou desativar a apresentação de ícones na barra de estado."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Poupança de dados"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Poupança de dados ativada"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Poupança de dados desativada"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Ativado"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Barra de navegação"</string>
+ <string name="start" msgid="6873794757232879664">"Início"</string>
+ <string name="center" msgid="4327473927066010960">"Centro"</string>
+ <string name="end" msgid="125797972524818282">"Fim"</string>
+ <string name="space" msgid="804232271282109749">"Espaçador"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menu/comutador de teclado"</string>
+ <string name="select_button" msgid="1597989540662710653">"Selecionar o botão a adicionar"</string>
+ <string name="add_button" msgid="4134946063432258161">"Adicionar botão"</string>
+ <string name="save" msgid="2311877285724540644">"Guardar"</string>
+ <string name="reset" msgid="2448168080964209908">"Repor"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Sem botão de página inicial"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"É necessário um botão de página inicial para navegar neste dispositivo. Adicione um botão de página inicial antes de guardar."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Ajustar largura do botão"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Área de transferência"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"A Área de transferência permite arrastar itens diretamente para a área de transferência. Também é possível arrastar itens diretamente para fora da mesma, quando aí se encontram."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Botão de navegação personalizado"</string>
+ <string name="keycode" msgid="7335281375728356499">"Código de tecla"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Os códigos de tecla permitem adicionar teclas do teclado à Barra de navegação. Quando são premidos, emulam a tecla do teclado selecionada. É necessário selecionar primeiro a tecla para botão e depois uma imagem que será apresentada no mesmo."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Selecionar o botão do teclado"</string>
+ <string name="preview" msgid="9077832302472282938">"Pré-visualizar"</string>
</resources>
diff --git a/packages/SystemUI/res/values-pt-rPT/strings_car.xml b/packages/SystemUI/res/values-pt-rPT/strings_car.xml
index e53774b7..afb030a 100644
--- a/packages/SystemUI/res/values-pt-rPT/strings_car.xml
+++ b/packages/SystemUI/res/values-pt-rPT/strings_car.xml
@@ -20,5 +20,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="car_lockscreen_disclaimer_title" msgid="7997539137376896441">"Conduza com segurança"</string>
- <string name="car_lockscreen_disclaimer_text" msgid="3061224684092952864">"Mantenha-se completamente atento às condições de condução e respeite sempre as leis aplicáveis. As direções podem ser imprecisas, incompletas, perigosas, inadequadas, proibidas ou envolver a travessia de zonas administrativas. Os dados das empresas também podem ser imprecisos ou incompletos. Os dados não são fornecidos em tempo real e não é possível garantir a precisão da localização. Não manuseie o dispositivo móvel nem utilize aplicações não destinadas ao Android Auto durante a condução."</string>
+ <string name="car_lockscreen_disclaimer_text" msgid="3061224684092952864">"Mantenha-se completamente atento às condições de condução e respeite sempre as leis aplicáveis. As direções podem ser imprecisas, incompletas, perigosas, inadequadas, proibidas ou envolver a travessia de áreas administrativas. Os dados das empresas também podem ser imprecisos ou incompletos. Os dados não são fornecidos em tempo real e não é possível garantir a precisão da localização. Não manuseie o dispositivo móvel nem utilize aplicações não destinadas ao Android Auto durante a condução."</string>
</resources>
diff --git a/packages/SystemUI/res/values-pt-rPT/strings_tv.xml b/packages/SystemUI/res/values-pt-rPT/strings_tv.xml
deleted file mode 100644
index e0ca35d..0000000
--- a/packages/SystemUI/res/values-pt-rPT/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Fechar PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Ecrã inteiro"</string>
- <string name="pip_play" msgid="674145557658227044">"Reproduzir"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Interromper"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Cancelar"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Prima sem soltar a tecla HOME para controlar o PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml
index 38a6b79..c2fd0d1d 100644
--- a/packages/SystemUI/res/values-pt/strings.xml
+++ b/packages/SystemUI/res/values-pt/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Sem SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Dados da rede celular desativados"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Tethering Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Modo avião."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Sem cartão SIM."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixação de tela"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"pesquisar"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Não foi possível iniciar <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Mais"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Mais <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Histórico"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Limpar"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divisão horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divisão vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divisão personalizada"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Cores normais"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Cores noturnas"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Cores personalizadas"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automáticas"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Cores desconhecidas"</string>
<string name="color_transform" msgid="6985460408079086090">"Modificação de cor"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Mostrar bloco de configurações rápidas"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Fones de ouvido conectados"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Fone de ouvido conectado"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Ativar ou desativar a exibição de ícones na barra de status."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Economia de dados"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Economia de dados ativada"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"A Economia de dados está desativada"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Ativado"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Barra de navegação"</string>
+ <string name="start" msgid="6873794757232879664">"Iniciar"</string>
+ <string name="center" msgid="4327473927066010960">"Centralizar"</string>
+ <string name="end" msgid="125797972524818282">"Fim"</string>
+ <string name="space" msgid="804232271282109749">"Espaçador"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Alternador de teclado / menu"</string>
+ <string name="select_button" msgid="1597989540662710653">"Selecione o botão p/ adicionar"</string>
+ <string name="add_button" msgid="4134946063432258161">"Adicionar botão"</string>
+ <string name="save" msgid="2311877285724540644">"Salvar"</string>
+ <string name="reset" msgid="2448168080964209908">"Redefinir"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Nenhum botão de início encontrado"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"É necessário um botão de início para navegar neste dispositivo. Adicione um botão de início antes de salvar."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Ajustar largura do botão"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Prancheta"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"A Prancheta permite que itens sejam arrastados diretamente para a área de transferência. Também é possível arrastar os itens diretamente para fora da área de transferência, quando estiver presente."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Botão de navegação personalizado"</string>
+ <string name="keycode" msgid="7335281375728356499">"Código de tecla"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Os botões de código de tecla permitem que as teclas do teclado sejam adicionadas à barra de navegação. Quando pressionados, eles emulam a tecla selecionada. Primeiro, a tecla deve ser selecionada para o botão, seguida de uma imagem a ser exibida no botão."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Escolha um botão do teclado"</string>
+ <string name="preview" msgid="9077832302472282938">"Visualização"</string>
</resources>
diff --git a/packages/SystemUI/res/values-pt/strings_tv.xml b/packages/SystemUI/res/values-pt/strings_tv.xml
deleted file mode 100644
index 131507c..0000000
--- a/packages/SystemUI/res/values-pt/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Fechar PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Tela cheia"</string>
- <string name="pip_play" msgid="674145557658227044">"Reproduzir"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pausar"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Cancelar"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Mantenha \"PÁGINA INICIAL\" pressionado para controlar o PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml
index e045fc8..78b9f1f 100644
--- a/packages/SystemUI/res/values-ro/strings.xml
+++ b/packages/SystemUI/res/values-ro/strings.xml
@@ -147,6 +147,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Niciun card SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Datele mobile sunt dezactivate"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Conectarea ca modem prin Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Mod Avion."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Niciun card SIM."</string>
@@ -301,8 +302,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixare pe ecran"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"căutare"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> nu a putut porni."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Mai mult"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Încă <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Istoric"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Ștergeți"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divizare pe orizontală"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divizare pe verticală"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divizare personalizată"</string>
@@ -468,6 +469,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Culori normale"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Culori de noapte"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Culori personalizate"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automat"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Culori necunoscute"</string>
<string name="color_transform" msgid="6985460408079086090">"Modificarea culorilor"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Afișați caseta cu Setările rapide"</string>
@@ -494,10 +496,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Căștile sunt conectate"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Setul căști-microfon este conectat"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Activați sau dezactivați afișarea pictogramelor în bara de stare."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Economizor de date"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Economizorul de date este activat"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Economizorul de date este dezactivat"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Activați"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Bară de navigare"</string>
+ <string name="start" msgid="6873794757232879664">"La început"</string>
+ <string name="center" msgid="4327473927066010960">"În centru"</string>
+ <string name="end" msgid="125797972524818282">"La final"</string>
+ <string name="space" msgid="804232271282109749">"Buton de spațiu"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Comutator meniu/tastatură"</string>
+ <string name="select_button" msgid="1597989540662710653">"Selectați butonul de adăugat"</string>
+ <string name="add_button" msgid="4134946063432258161">"Adăugați un buton"</string>
+ <string name="save" msgid="2311877285724540644">"Salvați"</string>
+ <string name="reset" msgid="2448168080964209908">"Resetaţi"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Nu s-a găsit niciun buton Ecran de pornire"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Pentru a naviga pe acest dispozitiv este necesar un buton Ecran de pornire. Adăugați un buton Ecran de pornire înainte să salvați."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Ajustați lățimea butonului"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Clipboard"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Folosind butonul Clipboard puteți să trageți elemente direct în clipboard. De asemenea, elementele pot fi trase direct din clipboard atunci când există."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Buton personalizat pentru navigare"</string>
+ <string name="keycode" msgid="7335281375728356499">"Cod de tastă"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Folosind butoanele cu coduri de taste puteți să adăugați taste de la tastatură în Bara de navigare. Când le apăsați, acestea simulează tasta selectată de la tastatură. Mai întâi, trebuie să selectați o tastă pentru un buton, apoi o imagine care să apară pe buton."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Selectați butonul de la tastatură"</string>
+ <string name="preview" msgid="9077832302472282938">"Previzualizare"</string>
</resources>
diff --git a/packages/SystemUI/res/values-ro/strings_tv.xml b/packages/SystemUI/res/values-ro/strings_tv.xml
deleted file mode 100644
index b3cd663..0000000
--- a/packages/SystemUI/res/values-ro/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Închideți PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Ecran complet"</string>
- <string name="pip_play" msgid="674145557658227044">"Redați"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Întrerupeți"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Anulați"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Pentru a controla PIP, atingeți lung ECRAN DE PORNIRE"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml
index d9f7a9b..abecde7 100644
--- a/packages/SystemUI/res/values-ru/strings.xml
+++ b/packages/SystemUI/res/values-ru/strings.xml
@@ -148,6 +148,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"SIM-карта отсутствует."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Передача мобильных данных отключена"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth-модем"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Режим полета."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Нет SIM-карты."</string>
@@ -302,8 +303,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"Заблокировать в приложении"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"поиск"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Не удалось запустить приложение \"<xliff:g id="APP">%s</xliff:g>\""</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Ещё"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Ещё <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Журнал"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Очистить"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Разделить по горизонтали"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Разделить по вертикали"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Разделить по-другому"</string>
@@ -469,6 +470,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Обычные цвета"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Ночные цвета"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Собственные цвета"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Авто"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Неизвестные цвета"</string>
<string name="color_transform" msgid="6985460408079086090">"Цветовые настройки"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Показывать панель быстрых настроек"</string>
@@ -495,10 +497,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Наушники подключены"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Гарнитура подключена"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Включение и отключение показа значков в строке состояния"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Экономия трафика"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Режим экономии трафика включен"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Режим экономии трафика отключен"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Включено"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Панель навигации"</string>
+ <string name="start" msgid="6873794757232879664">"Вверху"</string>
+ <string name="center" msgid="4327473927066010960">"В центре"</string>
+ <string name="end" msgid="125797972524818282">"Внизу"</string>
+ <string name="space" msgid="804232271282109749">"Пробел"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Меню/переключение раскладки"</string>
+ <string name="select_button" msgid="1597989540662710653">"Выберите кнопку"</string>
+ <string name="add_button" msgid="4134946063432258161">"Добавить кнопку"</string>
+ <string name="save" msgid="2311877285724540644">"Сохранить"</string>
+ <string name="reset" msgid="2448168080964209908">"Сбросить"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Ошибка"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Прежде чем сохранить настройки, добавьте кнопку перехода на главный экран."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Выбор ширины кнопки"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Буфер обмена"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"С помощью этой кнопки можно копировать файлы в буфер обмена и извлекать их из него."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Персонализированная кнопка навигации"</string>
+ <string name="keycode" msgid="7335281375728356499">"Код клавиши"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"С помощью этой кнопки можно добавлять клавиши с клавиатуры на панель навигации. Необходимо выбрать клавишу и изображение для соответствующей кнопки."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Выберите клавишу"</string>
+ <string name="preview" msgid="9077832302472282938">"Просмотр"</string>
</resources>
diff --git a/packages/SystemUI/res/values-ru/strings_tv.xml b/packages/SystemUI/res/values-ru/strings_tv.xml
deleted file mode 100644
index 35ecb1c..0000000
--- a/packages/SystemUI/res/values-ru/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Выйти из режима \"Кадр в кадре\""</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Во весь экран"</string>
- <string name="pip_play" msgid="674145557658227044">"Воспроизвести"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Приостановить"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Отмена"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Управляйте режимом \"Кадр в кадре\", удерживая кнопку ГЛАВНАЯ"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-si-rLK/strings.xml b/packages/SystemUI/res/values-si-rLK/strings.xml
index 69514d4..919e67a 100644
--- a/packages/SystemUI/res/values-si-rLK/strings.xml
+++ b/packages/SystemUI/res/values-si-rLK/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"SIM නැත."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"සෙලියුලර් දත්ත ක්රියාවිරහිතයි"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"බ්ලූටූත් ටෙදරින්."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"අහස්යානා ආකාරය."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"SIM කාඩ්පත නැත."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"තිර ඇමිණීම"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"සෙවීම"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> ආරම්භ කළ නොහැක."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"තවත්"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"තව <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"ඉතිහාසය"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"හිස් කරන්න"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"තිරස්ව වෙන් කරන්න"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"සිරස්ව වෙන් කරන්න"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"අභිමත ලෙස වෙන් කරන්න"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"සාමාන්ය වර්ණ"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"රාත්රී වර්ණ"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"අභිරුචි වර්ණ"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"ස්වයංක්රිය"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"නොදන්නා වර්ණ"</string>
<string name="color_transform" msgid="6985460408079086090">"වර්ණ වෙනස් කිරීම"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"ඉක්මන් සැකසීම් ටයිලය පෙන්වන්න"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"හෙඩ්ෆෝන් සම්බන්ධ කළ"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"හෙඩ්සෙට් සම්බන්ධ කළ"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"තත්ත්ව තීරුව මත අයිකන පෙන්වීම සබල හෝ අබල කරන්න."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"දත්ත සුරැකුම"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"දත්ත සුරැකුම ක්රියාත්මකයි"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"දත්ත සුරැකුම ක්රියාවිරහිතයි"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"ක්රියාත්මකයි"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"සංචලන තීරුව"</string>
+ <string name="start" msgid="6873794757232879664">"ආරම්භ කරන්න"</string>
+ <string name="center" msgid="4327473927066010960">"මධ්ය"</string>
+ <string name="end" msgid="125797972524818282">"අවසානයි"</string>
+ <string name="space" msgid="804232271282109749">"ඉඩ"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"මෙනු / යතුරු පුවරු මාරුව"</string>
+ <string name="select_button" msgid="1597989540662710653">"එක් කිරීමට බොත්තම තෝරන්න"</string>
+ <string name="add_button" msgid="4134946063432258161">"එක් කරන්න බොත්තම"</string>
+ <string name="save" msgid="2311877285724540644">"සුරකින්න"</string>
+ <string name="reset" msgid="2448168080964209908">"යළි පිහිටුවන්න"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"මුල් පිටු බොත්තමක් හමු නොවිණි"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"මෙම උපාංගය සංචලනය කිරීමට හැකි වීමට මුල් පිටු යතුරක් අවශ්යයි. කරුණාකර සුරැකීමට පෙර මුල් පිටු යතුරක් එක් කරන්න."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"බොත්තම් පළල සීරුමාරු කරන්න"</string>
+ <string name="clipboard" msgid="1313879395099896312">"පසුරු පුවරුව"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"අයිතම කෙලින්ම පසුරු පුවරුවට ඇද ගෙන ඒමට පසුරු පුවරුව ඉඩ දෙයි. අයිතම පසුරු පුවරුවෙහි ඇති විට කෙලින්ම ඉවතට ඇද ගෙන යාමටද හැකිය."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"අභිරුචි සංචලන බොත්තම"</string>
+ <string name="keycode" msgid="7335281375728356499">"යතුරු කේතය"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"යතුරු කේත බොත්තම් යතුරු පුවරු යතුරු සංචලන තීරුවට එක් කිරීමට ඉඩ දෙයි. එබූ විට ඒවා තෝරන ලද යතුරු පුවරු යතුර ලබා දෙයි. පළමුව යතුර, ඊට පසු බොත්තම මත පෙන්වන රූපයක් සමගින් බොත්තම සඳහා තේරිය යුතුය."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"යතුරු පුවරු බොත්තම තෝරන්න"</string>
+ <string name="preview" msgid="9077832302472282938">"පෙරදසුන"</string>
</resources>
diff --git a/packages/SystemUI/res/values-si-rLK/strings_tv.xml b/packages/SystemUI/res/values-si-rLK/strings_tv.xml
deleted file mode 100644
index b3beef3..0000000
--- a/packages/SystemUI/res/values-si-rLK/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP වසන්න"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"සම්පූර්ණ තිරය"</string>
- <string name="pip_play" msgid="674145557658227044">"ධාවනය කරන්න"</string>
- <string name="pip_pause" msgid="8412075640017218862">"විරාමය"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"අවලංගු කරන්න"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP පාලනය කිරීමට HOME අල්ලාගෙන සිටින්න"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml
index 9ef3d47..27c2cf8 100644
--- a/packages/SystemUI/res/values-sk/strings.xml
+++ b/packages/SystemUI/res/values-sk/strings.xml
@@ -148,6 +148,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Žiadna SIM karta."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobilné dáta sú vypnuté"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Pripojenie cez Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Režim v lietadle."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Žiadna SIM karta."</string>
@@ -302,8 +303,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pripnutie k obrazovke"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"hľadať"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Aplikáciu <xliff:g id="APP">%s</xliff:g> sa nepodarilo spustiť"</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Viac"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Ďalšie (<xliff:g id="NUMBER">%d</xliff:g>)"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"História"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Vymazať"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Rozdeliť vodorovné"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Rozdeliť zvislé"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Rozdeliť vlastné"</string>
@@ -469,6 +470,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Normálne farby"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Nočné farby"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Vlastné farby"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automatické"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Neznáme farby"</string>
<string name="color_transform" msgid="6985460408079086090">"Úprava farieb"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Zobraziť dlaždicu Rýchle nastavenia"</string>
@@ -495,10 +497,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Slúchadlá pripojené"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Náhlavná súprava pripojená"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Umožňuje aktivovať alebo deaktivovať zobrazenie ikon v stavovom riadku."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Šetrič dát"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Šetrič dát je zapnutý"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Šetrič dát je vypnutý"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Zapnuté"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigačný panel"</string>
+ <string name="start" msgid="6873794757232879664">"Začiatok"</string>
+ <string name="center" msgid="4327473927066010960">"Stred"</string>
+ <string name="end" msgid="125797972524818282">"Koniec"</string>
+ <string name="space" msgid="804232271282109749">"Medzerník"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Prepínač – ponuka/klávesnica"</string>
+ <string name="select_button" msgid="1597989540662710653">"Výber tlačidla, ktoré sa má pridať"</string>
+ <string name="add_button" msgid="4134946063432258161">"Pridať tlačidlo"</string>
+ <string name="save" msgid="2311877285724540644">"Uložiť"</string>
+ <string name="reset" msgid="2448168080964209908">"Obnoviť"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Tlačidlo Plocha sa nenašlo"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Ak chcete používať navigáciu v tomto zariadení, musíte použiť tlačidlo Plocha. Pred uložením pridajte tlačidlo Plocha."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Upraviť šírku tlačidla"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Schránka"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Schránka umožňuje presunúť položky priamo do schránky. Ak ju máte k dispozícii, môžete ich z nej aj priamo vytiahnuť."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Vlastné tlačidlo navigácie"</string>
+ <string name="keycode" msgid="7335281375728356499">"Kód klávesnice"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Tlačidlá kódov klávesnice umožňujú pridanie klávesov na navigačný panel. Po stlačení simulujú funkcie vybraných klávesov. Najprv musíte pre tlačidlo vybrať kláves a následne musí byť na tlačidle obrázok."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Výber tlačidla klávesnice"</string>
+ <string name="preview" msgid="9077832302472282938">"Ukážka"</string>
</resources>
diff --git a/packages/SystemUI/res/values-sk/strings_tv.xml b/packages/SystemUI/res/values-sk/strings_tv.xml
deleted file mode 100644
index 24c42d1..0000000
--- a/packages/SystemUI/res/values-sk/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Zavrieť režim PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Celá obrazovka"</string>
- <string name="pip_play" msgid="674145557658227044">"Prehrať"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pozastaviť"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Zrušiť"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Ak chcete ovládať režim PIP, podržte tlačidlo plochy"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml
index 9fda17b..55899f8 100644
--- a/packages/SystemUI/res/values-sl/strings.xml
+++ b/packages/SystemUI/res/values-sl/strings.xml
@@ -148,6 +148,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Ni kartice SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Prenos podatkov v mobilnih omrežjih je izklopljen"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Internet prek Bluetootha."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Način za letalo."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Ni kartice SIM."</string>
@@ -302,8 +303,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pripenjanje zaslona"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"iskanje"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Aplikacije <xliff:g id="APP">%s</xliff:g> ni bilo mogoče zagnati."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Več"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"In še <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Zgodovina"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Izbriši"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Razdeli vodoravno"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Razdeli navpično"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Razdeli po meri"</string>
@@ -469,6 +470,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Običajne barve"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Nočne barve"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Barve po meri"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Samodejno"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Neznane barve"</string>
<string name="color_transform" msgid="6985460408079086090">"Spreminjanje barv"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Prikaz ploščice s hitrimi nastavitvami"</string>
@@ -495,10 +497,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Slušalke priključene"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Slušalke z mikrofonom priključene"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Omogoči ali onemogoči prikaz ikon v vrstici stanja."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Varčevanje s podatki"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Varčevanje s podatki je vklopljeno"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Varčevanje s podatki je izklopljeno"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Vklopljeno"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Vrstica za krmarjenje"</string>
+ <string name="start" msgid="6873794757232879664">"Začetek"</string>
+ <string name="center" msgid="4327473927066010960">"Sredina"</string>
+ <string name="end" msgid="125797972524818282">"Konec"</string>
+ <string name="space" msgid="804232271282109749">"Preslednica"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Preklopnik menija/tipkovnice"</string>
+ <string name="select_button" msgid="1597989540662710653">"Izbira gumba za dodajanje"</string>
+ <string name="add_button" msgid="4134946063432258161">"Dodaj gumb"</string>
+ <string name="save" msgid="2311877285724540644">"Shrani"</string>
+ <string name="reset" msgid="2448168080964209908">"Ponastavi"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Ni gumba za začetni zaslon"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Če želite krmariti po tej napravi, potrebujete gumb za začetni zaslon. Pred shranjevanjem dodajte gumb za začetni zaslon."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Prilagajanje širine gumba"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Odložišče"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Odložišče omogoča, da elemente povlečete neposredno vanj. Ko je odložišče na voljo, je elemente prav tako mogoče povleči iz njega."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Gumb za krmarjenje po meri"</string>
+ <string name="keycode" msgid="7335281375728356499">"Koda tipke"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Gumbi za kode tipk omogočajo dodajanje tipk tipkovnice v vrstico za krmarjenje. Ko jih pritisnete, posnemajo izbrano tipko tipkovnice. Najprej je treba izbrati tipko za gumb, nato pa sliko, ki bo prikazana na gumbu."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Izbira gumba tipkovnice"</string>
+ <string name="preview" msgid="9077832302472282938">"Predogled"</string>
</resources>
diff --git a/packages/SystemUI/res/values-sl/strings_tv.xml b/packages/SystemUI/res/values-sl/strings_tv.xml
deleted file mode 100644
index 28e9d98..0000000
--- a/packages/SystemUI/res/values-sl/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Zapri način PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Celozaslonsko"</string>
- <string name="pip_play" msgid="674145557658227044">"Predvajanje"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Zaustavitev"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Prekliči"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Pridržite tipko HOME za upravljanje načina PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-sq-rAL/strings.xml b/packages/SystemUI/res/values-sq-rAL/strings.xml
index a43ac7e..3c913c9 100644
--- a/packages/SystemUI/res/values-sq-rAL/strings.xml
+++ b/packages/SystemUI/res/values-sq-rAL/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Nuk ka kartë SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Të dhënat celulare joaktive"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Po lidhet me \"bluetooth\"."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"modaliteti i aeroplanit"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Nuk ka kartë SIM."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"gozhdimi i ekranit"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"kërko"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> nuk mundi të nisej."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Më shumë"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> të tjera"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Historiku"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Pastro"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Ndaje horizontalisht"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Ndaj vertikalisht"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Ndaj të personalizuarën"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Ngjyrat normale"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Ngjyrat e natës"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Ngjyrat e personalizuara"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automatike"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Ngjyra të panjohura"</string>
<string name="color_transform" msgid="6985460408079086090">"Modifikimi i ngjyrës"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Pllakëza Shfaq cilësimet e shpejta"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Kufjet u lidhën"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Kufjet me mikrofon u lidhën"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Aktivizo ose çaktivizo shfaqjen e ikonave në shiritin e statusit."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Kursyesi i të dhënave"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Kursyesi i të dhënave është aktiv"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Kursyesi i të dhënave është joaktiv"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Aktiv"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Shiriti i navigimit"</string>
+ <string name="start" msgid="6873794757232879664">"Nis"</string>
+ <string name="center" msgid="4327473927066010960">"Qendror"</string>
+ <string name="end" msgid="125797972524818282">"Fundi"</string>
+ <string name="space" msgid="804232271282109749">"Tasti i hapësirës"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Ndërruesi i menysë/tastierës"</string>
+ <string name="select_button" msgid="1597989540662710653">"Zgjidh butonin për ta shtuar"</string>
+ <string name="add_button" msgid="4134946063432258161">"Shto buton"</string>
+ <string name="save" msgid="2311877285724540644">"Ruaj"</string>
+ <string name="reset" msgid="2448168080964209908">"Rivendos"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Nuk u gjet asnjë buton \"Kreu\""</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Kërkohet një buton \"Kreu\" për të naviguar në këtë pajisje. Shto një buton \"Kreu\" përpara se ta ruash."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Rregullo gjerësinë e butonit"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Kujtesa e fragmenteve"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Kujtesa e fragmenteve lejon që artikujt të zvarriten direkt në kujtesën e fragmenteve. Artikujt mund të zvarriten gjithashtu direkt jashtë kujtesës së fragmenteve kur janë të pranishëm."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Butoni i personalizuar i navigimit"</string>
+ <string name="keycode" msgid="7335281375728356499">"Kodi i tasteve"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Butonat e kodit të tasteve lejojnë që të shtohen në shiritin e navigimit tastet e tastierës. Kur shtypen ato shfaqin tastin e zgjedhur të tastierës. Në fillim duhet të zgjidhet tasti për butonin, i ndjekur nga një imazh që do të tregohet në buton."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Zgjidh butonin e tastierës"</string>
+ <string name="preview" msgid="9077832302472282938">"Pamja paraprake"</string>
</resources>
diff --git a/packages/SystemUI/res/values-sq-rAL/strings_tv.xml b/packages/SystemUI/res/values-sq-rAL/strings_tv.xml
deleted file mode 100644
index 31298a4..0000000
--- a/packages/SystemUI/res/values-sq-rAL/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Mbyll PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Ekrani i plotë"</string>
- <string name="pip_play" msgid="674145557658227044">"Luaj"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pauzë"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Anulo"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Mbaj shtypur HOME për të kontrolluar PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml
index 765df27..1c3113b 100644
--- a/packages/SystemUI/res/values-sr/strings.xml
+++ b/packages/SystemUI/res/values-sr/strings.xml
@@ -147,6 +147,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Нема SIM картице."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Подаци за мобилне уређаје су искључени"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth привезивање."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Режим рада у авиону."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Нема SIM картице."</string>
@@ -301,8 +302,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"качење екрана"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"претражи"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Покретање апликације <xliff:g id="APP">%s</xliff:g> није успело."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Још"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Још <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Историја"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Обриши"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Подели хоризонтално"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Подели вертикално"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Прилагођено дељење"</string>
@@ -468,6 +469,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Нормалне боје"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Ноћне боје"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Прилагођене боје"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Аутоматски"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Непознате боје"</string>
<string name="color_transform" msgid="6985460408079086090">"Измена боја"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Прикажи плочицу Брза подешавања"</string>
@@ -494,10 +496,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Слушалице су повезане"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Наглавне слушалице су повезане"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Омогућите или онемогућите приказивање икона на статусној траци."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Уштеда података"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Уштеда података је укључена"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Уштеда података је искључена"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Укључено"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Трака за навигацију"</string>
+ <string name="start" msgid="6873794757232879664">"Покрени"</string>
+ <string name="center" msgid="4327473927066010960">"Центар"</string>
+ <string name="end" msgid="125797972524818282">"Дно"</string>
+ <string name="space" msgid="804232271282109749">"Ознака за размак"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Мени/Тастатура пребацивач"</string>
+ <string name="select_button" msgid="1597989540662710653">"Изаберите дугме за додавање"</string>
+ <string name="add_button" msgid="4134946063432258161">"Додај дугме"</string>
+ <string name="save" msgid="2311877285724540644">"Сачувај"</string>
+ <string name="reset" msgid="2448168080964209908">"Поново постави"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Нисмо пронашли дугме Почетна"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Дугме Почетна је неопходно за навигацију на овом уређају. Додајте дугме Почетна пре него што сачувате измене."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Прилагоди ширину дугмета"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Привремена меморија"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Привремена меморија омогућава да се ставке превлаче директно у привремену меморију. Постојеће ставке могу да се превлаче и директно из привремене меморије."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Прилагођено дугме за навигацију"</string>
+ <string name="keycode" msgid="7335281375728356499">"Кôд тастера"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Дугмад за кодове тастера омогућава да се на траку за навигацију додају тастери на тастатури. Када притиснете дугме, симулира се изабрани тастер на тастатури. Прво морате да изаберете тастер за дугме, па слику коју ће се приказивати на дугмету."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Изаберите дугме за тастатуру"</string>
+ <string name="preview" msgid="9077832302472282938">"Преглед"</string>
</resources>
diff --git a/packages/SystemUI/res/values-sr/strings_tv.xml b/packages/SystemUI/res/values-sr/strings_tv.xml
deleted file mode 100644
index 3c6b59e..0000000
--- a/packages/SystemUI/res/values-sr/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Затвори PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Цео екран"</string>
- <string name="pip_play" msgid="674145557658227044">"Пусти"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Паузирај"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Откажи"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Задржите тастер за ПОЧЕТНИ ЕКРАН да бисте контролисали PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml
index c76d1d3..c2a31cc 100644
--- a/packages/SystemUI/res/values-sv/strings.xml
+++ b/packages/SystemUI/res/values-sv/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Inget SIM-kort."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobildata inaktiverat"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Internetdelning via Bluetooth"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Flygplansläge"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Inget SIM-kort."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fästa skärmen"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"sök"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Det gick inte att starta appen <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Mer"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> till"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Historik"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Rensa"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Dela horisontellt"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Dela vertikalt"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Dela anpassad"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Normala färger"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Nattfärger"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Anpassade färger"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Automatiskt"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Okända färger"</string>
<string name="color_transform" msgid="6985460408079086090">"Färgändring"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Visa rutan Snabbinställningar"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Hörlurar anslutna"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Headset anslutet"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Visa eller dölj ikoner i statusfältet."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Databesparing"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Databesparing är aktiverat"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Databesparing är inaktiverat"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"På"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigeringsfält"</string>
+ <string name="start" msgid="6873794757232879664">"Början"</string>
+ <string name="center" msgid="4327473927066010960">"Centrera"</string>
+ <string name="end" msgid="125797972524818282">"Slutet"</string>
+ <string name="space" msgid="804232271282109749">"Mellanslag"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Byt mellan meny/tangentbord"</string>
+ <string name="select_button" msgid="1597989540662710653">"Välj en knapp att lägga till"</string>
+ <string name="add_button" msgid="4134946063432258161">"Lägg till knapp"</string>
+ <string name="save" msgid="2311877285724540644">"Spara"</string>
+ <string name="reset" msgid="2448168080964209908">"Återställ"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Startskärmsknapp hittades inte"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Det behövs en startskärmsknapp för att kunna navigera den här enheten. Lägg till en startskärmsknapp innan du sparar."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Justera knappens bredd"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Urklipp"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Objekt kan dras direkt till urklipp. Objekt kan också dras direkt från urklipp när de visas."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Anpassad navigeringsknapp"</string>
+ <string name="keycode" msgid="7335281375728356499">"Tangentkod"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Med knappar för tangentkod kan tangenter läggas till i navigeringsfältet. När du trycker på dem förvandlas de till den valda tangenten. Först måste du välja en tangent för knappen och därefter en bild som ska visas på knappen."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Välj tangentbordsknapp"</string>
+ <string name="preview" msgid="9077832302472282938">"Förhandsgranskning"</string>
</resources>
diff --git a/packages/SystemUI/res/values-sv/strings_tv.xml b/packages/SystemUI/res/values-sv/strings_tv.xml
deleted file mode 100644
index b36c19f..0000000
--- a/packages/SystemUI/res/values-sv/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Stäng PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Helskärm"</string>
- <string name="pip_play" msgid="674145557658227044">"Spela upp"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pausa"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Avbryt"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Håll ned HOME om du vill styra PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml
index 031e2b1..bc05d79 100644
--- a/packages/SystemUI/res/values-sw/strings.xml
+++ b/packages/SystemUI/res/values-sw/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Ukingo"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Hakuna SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Data ya simu za mkononi Imezimwa"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Shiriki intaneti kwa Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Hali ya ndege."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Hakuna SIM kadi."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"kudumisha programu moja"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"tafuta"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Haikuweza kuanzisha <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Zaidi"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Nyingine <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Historia"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Futa"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Gawanya Mlalo"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Gawanya Wima"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Maalum Iliyogawanywa"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Rangi za kawaida"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Rangi za usiku"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Rangi maalum"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Otomatiki"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Rangi zisizojulikana"</string>
<string name="color_transform" msgid="6985460408079086090">"Ubadilishaji wa rangi"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Onyesha kigae cha Mipangilio ya Haraka"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Imeunganisha spika za masikioni"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Imeunganisha vifaa vya sauti"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Washa au uzime aikoni ili zisionekane kwenye sehemu ya arifa"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Kiokoa Data"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Kiokoa Data kimewashwa"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Kiokoa Data kimezimwa"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Imewashwa"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Sehemu ya viungo muhimu"</string>
+ <string name="start" msgid="6873794757232879664">"Anza"</string>
+ <string name="center" msgid="4327473927066010960">"Weka katikati"</string>
+ <string name="end" msgid="125797972524818282">"Mwisho"</string>
+ <string name="space" msgid="804232271282109749">"Kiweka nafasi"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Swichi ya Menyu / Kibodi"</string>
+ <string name="select_button" msgid="1597989540662710653">"Chagua kitufe ili uongeze"</string>
+ <string name="add_button" msgid="4134946063432258161">"Ongeza kitufe"</string>
+ <string name="save" msgid="2311877285724540644">"Hifadhi"</string>
+ <string name="reset" msgid="2448168080964209908">"Weka upya"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Kitufe cha mwanzo hakijapatikana"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Kitufe cha Mwanzo kinahitajika ili uweze kutumia viungo vya kifaa hiki. Tafadhali ongeza kitufe cha mwanzo kabla ya kuhifadhi."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Rekebisha upana wa kitufe"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Ubao klipu"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Kipengele cha Ubao klipu hukuwezesha kuburuta vipengee moja kwa moja hadi kwenye ubao klipu. Unaweza pia kuburuta vipengee moja kwa moja kutoka kwenye ubao klipu kama vipo."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Kitufe maalum cha uelekezaji"</string>
+ <string name="keycode" msgid="7335281375728356499">"Msimbo wa ufunguo"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Vitufe vya msimbo wa ufunguo vinaruhusu vitufe vya kibodi kuongezwa kwenye Sehemu ya viungo muhimu. Vikibonyezwa, vinaiga kitufe kilichochaguliwa cha kibodi. Kwanza, ufunguo lazima uchaguliwe kwa kitufe, kisha picha itakayoonyeshwa kwenye kitufe."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Chagua Kitufe cha Kibodi"</string>
+ <string name="preview" msgid="9077832302472282938">"Onyesho la kuchungulia"</string>
</resources>
diff --git a/packages/SystemUI/res/values-sw/strings_tv.xml b/packages/SystemUI/res/values-sw/strings_tv.xml
deleted file mode 100644
index fc0f414..0000000
--- a/packages/SystemUI/res/values-sw/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Funga PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Skrini nzima"</string>
- <string name="pip_play" msgid="674145557658227044">"Cheza"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Sitisha"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Ghairi"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Shikilia kitufe cha HOME ili udhibiti PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-ta-rIN/strings.xml b/packages/SystemUI/res/values-ta-rIN/strings.xml
index b64ef74..5eaf15d 100644
--- a/packages/SystemUI/res/values-ta-rIN/strings.xml
+++ b/packages/SystemUI/res/values-ta-rIN/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"வைஃபை"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"சிம் இல்லை."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"செல்லுலார் தரவு முடக்கப்பட்டது"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"புளூடூத் டெதெரிங்."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"விமானப் பயன்முறை."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"சிம் கார்டு இல்லை."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"திரையை பின் செய்தல்"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"தேடு"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g>ஐத் தொடங்க முடியவில்லை."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"மேலும்"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"மேலும் <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"வரலாறு"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"அழி"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"கிடைமட்டமாகப் பிரி"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"செங்குத்தாகப் பிரி"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"தனிவிருப்பத்தில் பிரி"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"இயல்பான வண்ணங்கள்"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"இரவுநேர வண்ணங்கள்"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"தனிப்பயன் வண்ணங்கள்"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"தானியங்கு"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"அறியப்படாத வண்ணங்கள்"</string>
<string name="color_transform" msgid="6985460408079086090">"வண்ண மாற்றம்"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"விரைவு அமைப்புகள் டைலைக் காட்டு"</string>
@@ -485,7 +487,7 @@
<string name="tuner_full_zen_title" msgid="5905081395132280054">"ஒலி உரையாடலில் தொந்தரவு செய்ய வேண்டாம் என்பதைக் காட்டு"</string>
<string name="tuner_full_zen_summary" msgid="6883568374520596402">"ஒலி உரையாடலில் தொந்தரவு செய்ய வேண்டாம் என்பதன் முழுக் கட்டுப்பாட்டையும் அனுமதி."</string>
<string name="volume_and_do_not_disturb" msgid="3114580364524650941">"ஒலி மற்றும் தொந்தரவு செய்ய வேண்டாம்"</string>
- <string name="volume_down_silent" msgid="66962568467719591">"ஒலியைக் குறைக்கும் போது தொந்தரவு செய்ய வேண்டாம் என்பதை இயக்கு"</string>
+ <string name="volume_down_silent" msgid="66962568467719591">"ஒலியைக் குறைக்கும்போது தொந்தரவு செய்ய வேண்டாம் என்பதை இயக்கு"</string>
<string name="volume_up_silent" msgid="7141255269783588286">"ஒலியைக் கூட்டும் போது தொந்தரவு செய்ய வேண்டாம் என்பதை முடக்கு"</string>
<string name="battery" msgid="7498329822413202973">"பேட்டரி"</string>
<string name="clock" msgid="7416090374234785905">"கடிகாரம்"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"ஹெட்ஃபோன்கள் இணைக்கப்பட்டன"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"ஹெட்செட் இணைக்கப்பட்டது"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"நிலைப் பட்டியில் ஐகான்களைக் காட்டுவதை இயக்கும் அல்லது முடக்கும்."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"தரவுச் சேமிப்பான்"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"தரவுச் சேமிப்பான் இயக்கப்பட்டது"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"தரவுச் சேமிப்பான் முடக்கப்பட்டது"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"இயக்கு"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"வழிசெலுத்தல் பட்டி"</string>
+ <string name="start" msgid="6873794757232879664">"தொடங்கு"</string>
+ <string name="center" msgid="4327473927066010960">"மையம்"</string>
+ <string name="end" msgid="125797972524818282">"முடிவு"</string>
+ <string name="space" msgid="804232271282109749">"இடைவெளி"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"மெனு / விசைப்பலகை மாற்றி"</string>
+ <string name="select_button" msgid="1597989540662710653">"சேர்க்க, பொத்தானை தேர்வுசெய்க"</string>
+ <string name="add_button" msgid="4134946063432258161">"பொத்தானைச் சேர்"</string>
+ <string name="save" msgid="2311877285724540644">"சேமி"</string>
+ <string name="reset" msgid="2448168080964209908">"மீட்டமை"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"முகப்புப் பொத்தான் இல்லை"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"இந்தச் சாதனத்தில் வழிசெலுத்த, முகப்புப் பொத்தான் தேவை. சேமிக்கும் முன், முகப்புப் பொத்தானைச் சேர்க்கவும்."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"பொத்தானின் அகலத்தை மாற்று"</string>
+ <string name="clipboard" msgid="1313879395099896312">"கிளிப்போர்டு"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"கிளிப்ஃபோர்டில் உருப்படிகளை இழுத்து விடுவதற்கு கிளிப்போர்டு அனுமதிக்கும். கிளிப்போர்டிலிருந்து உருப்படிகளை வெளியேயும் இழுத்து விடலாம்."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"தனிப்பயன் வழிசெலுத்தல் பொத்தான்"</string>
+ <string name="keycode" msgid="7335281375728356499">"விசைக்குறியீடு"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"விசைக்குறியீட்டுப் பொத்தான்கள் மூலம் விசைப்பலகை விசைகளை வழிசெலுத்தல் பட்டியில் சேர்க்கலாம். அழுத்தும் போது, தேர்ந்தெடுத்த விசைப்பலகை விசையானது செயல்படும். பொத்தானுக்கான விசையை முதலில் தேர்ந்தெடுக்க வேண்டும், பிறகு பொத்தானில் காட்ட வேண்டிய படத்தைத் தேர்வுசெய்யவும்."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"விசைப்பலகைப் பொத்தானைத் தேர்ந்தெடுக்கவும்"</string>
+ <string name="preview" msgid="9077832302472282938">"மாதிரிக்காட்சி"</string>
</resources>
diff --git a/packages/SystemUI/res/values-ta-rIN/strings_car.xml b/packages/SystemUI/res/values-ta-rIN/strings_car.xml
index b40ba76..7ddd5e0 100644
--- a/packages/SystemUI/res/values-ta-rIN/strings_car.xml
+++ b/packages/SystemUI/res/values-ta-rIN/strings_car.xml
@@ -19,6 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_lockscreen_disclaimer_title" msgid="7997539137376896441">"பாதுகாப்பாக ஓட்டவும்"</string>
+ <string name="car_lockscreen_disclaimer_title" msgid="7997539137376896441">"பாதுகாப்பாக வண்டியோட்டவும்"</string>
<string name="car_lockscreen_disclaimer_text" msgid="3061224684092952864">"வாகனம் ஓட்டுவதற்கான சூழ்நிலைகளை முழுவதுமாகத் தெரிந்து வைத்திருக்கவும் மற்றும் பொருந்தும் விதிகளை எப்போதும் பின்பற்றவும். வழிகள் துல்லியமற்றதாக, முழுமையற்றதாக, ஆபத்துக்குரியதாக, பொருத்தமில்லாததாக, தடைசெய்யப்பட்டதாக அல்லது அரசின் கட்டுப்பாட்டில் உள்ள எல்லைகளைக் கடப்பதாக இருக்கலாம். வணிகத் தகவலும் துல்லியமற்றதாக அல்லது முழுமையற்றதாக இருக்கலாம். தரவு நிகழ்நேர அடிப்படையிலானது அல்ல மற்றும் இருப்பிடத் துல்லியத்திற்கு உத்தரவாதம் வழங்க முடியாது. வாகனம் ஓட்டும் போது மொபைல் சாதனத்தையோ அல்லது Android Auto மூலம் கட்டுப்படுத்த முடியாத பயன்பாடுகளையோ பயன்படுத்த வேண்டாம்."</string>
</resources>
diff --git a/packages/SystemUI/res/values-ta-rIN/strings_tv.xml b/packages/SystemUI/res/values-ta-rIN/strings_tv.xml
deleted file mode 100644
index 3f15396..0000000
--- a/packages/SystemUI/res/values-ta-rIN/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIPஐ மூடு"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"முழுத்திரை"</string>
- <string name="pip_play" msgid="674145557658227044">"இயக்கு"</string>
- <string name="pip_pause" msgid="8412075640017218862">"இடைநிறுத்து"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"ரத்துசெய்"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIPஐக் கட்டுப்படுத்த, முகப்பைப் பிடித்திருக்கவும்"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-te-rIN/strings.xml b/packages/SystemUI/res/values-te-rIN/strings.xml
index 1e953d8..cb408b9 100644
--- a/packages/SystemUI/res/values-te-rIN/strings.xml
+++ b/packages/SystemUI/res/values-te-rIN/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"ఎడ్జ్"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"సిమ్ లేదు."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"సెల్యులార్ డేటా ఆఫ్లో ఉంది"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"బ్లూటూత్ టెథెరింగ్."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"ఎయిర్ప్లేన్ మోడ్."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"SIM కార్డ్ లేదు."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"స్క్రీన్ పిన్నింగ్"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"శోధించు"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g>ని ప్రారంభించడం సాధ్యపడలేదు."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"మరింత"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"మరో <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"చరిత్ర"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"తీసివేయి"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"సమతలంగా విభజించు"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"లంబంగా విభజించు"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"అనుకూలంగా విభజించు"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"సాధారణ రంగులు"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"రాత్రి రంగులు"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"అనుకూల రంగులు"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"స్వయంచాలకం"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"తెలియని రంగులు"</string>
<string name="color_transform" msgid="6985460408079086090">"రంగు సవరణ"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"శీఘ్ర సెట్టింగ్ల టైల్ను చూపండి"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"హెడ్ఫోన్లు కనెక్ట్ చేయబడ్డాయి"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"హెడ్సెట్ కనెక్ట్ చేయబడింది"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"స్థితి పట్టీలో చిహ్నాలు ప్రదర్శించడాన్ని ప్రారంభించండి లేదా నిలిపివేయండి."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"డేటా సేవర్"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"డేటా సేవర్ ఆన్లో ఉంది"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"డేటా సేవర్ ఆఫ్లో ఉంది"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"ఆన్"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"నావిగేషన్ బార్"</string>
+ <string name="start" msgid="6873794757232879664">"ప్రారంభం"</string>
+ <string name="center" msgid="4327473927066010960">"మధ్య"</string>
+ <string name="end" msgid="125797972524818282">"ముగించు"</string>
+ <string name="space" msgid="804232271282109749">"స్పేసర్"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"మెను / కీబోర్డ్ స్విచర్"</string>
+ <string name="select_button" msgid="1597989540662710653">"జోడించడానికి బటన్ను ఎంచుకోండి"</string>
+ <string name="add_button" msgid="4134946063432258161">"బటన్ను జోడించు"</string>
+ <string name="save" msgid="2311877285724540644">"సేవ్ చేయి"</string>
+ <string name="reset" msgid="2448168080964209908">"రీసెట్ చేయి"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"హోమ్ బటన్ ఏదీ కనుగొనబడలేదు"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"ఈ పరికరాన్ని నావిగేట్ చేయడానికి హోమ్ బటన్ అవసరం. దయచేసి సేవ్ చేయడానికి ముందు హోమ్ బటన్ను జోడించండి."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"బటన్ వెడల్పును సర్దుబాటు చేయండి"</string>
+ <string name="clipboard" msgid="1313879395099896312">"క్లిప్బోర్డ్"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"క్లిప్బోర్డ్ అంశాలను నేరుగా క్లిప్బోర్డ్కి లాగడానికి అనుమతిస్తుంది. అలాగే క్లిప్బోర్డ్లో అంశాలు ఉన్నప్పుడు వాటిని నేరుగా క్లిప్బోర్డ్ నుండి బయటకు లాగవచ్చు."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"అనుకూల నావిగేషన్ బటన్"</string>
+ <string name="keycode" msgid="7335281375728356499">"కీకోడ్"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"కీకోడ్ బటన్లు నావిగేషన్ బార్లో కీబోర్డ్ కీలను జోడించడానికి అనుమతిస్తాయి. నొక్కినప్పుడు అవి ఎంచుకోబడిన కీబోర్డ్ కీ చర్యను పునరుత్పాదిస్తాయి. ముందుగా బటన్ కోసం తప్పనిసరిగా కీని ఎంచుకోవాలి, తర్వాత బటన్పై చూపాల్సిన చిత్రాన్ని ఎంచుకోవాలి."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"కీబోర్డ్ బటన్ను ఎంచుకోండి"</string>
+ <string name="preview" msgid="9077832302472282938">"పరిదృశ్యం"</string>
</resources>
diff --git a/packages/SystemUI/res/values-te-rIN/strings_tv.xml b/packages/SystemUI/res/values-te-rIN/strings_tv.xml
deleted file mode 100644
index a3148ddf..0000000
--- a/packages/SystemUI/res/values-te-rIN/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIPని మూసివేయి"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"పూర్తి స్క్రీన్"</string>
- <string name="pip_play" msgid="674145557658227044">"ప్లే చేయి"</string>
- <string name="pip_pause" msgid="8412075640017218862">"పాజ్ చేయి"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"రద్దు చేయి"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIPని నియంత్రించడానికి HOMEని నొక్కి ఉంచండి"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml
index c09b50f..9201b29 100644
--- a/packages/SystemUI/res/values-th/strings.xml
+++ b/packages/SystemUI/res/values-th/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"WiFi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"ไม่มีซิมการ์ด"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"ปิดข้อมูลเครือข่ายมือถือแล้ว"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"การปล่อยสัญญาณบลูทูธ"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"โหมดใช้งานบนเครื่องบิน"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"ไม่มีซิมการ์ด"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"การตรึงหน้าจอ"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ค้นหา"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"ไม่สามารถเริ่มใช้ <xliff:g id="APP">%s</xliff:g>"</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"เพิ่มเติม"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"อีก <xliff:g id="NUMBER">%d</xliff:g> งาน"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"ประวัติ"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"ล้าง"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"แยกในแนวนอน"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"แยกในแนวตั้ง"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"แยกแบบกำหนดเอง"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"สีปกติ"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"สียามค่ำคืน"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"สีที่กำหนดเอง"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"อัตโนมัติ"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"สีที่ไม่รู้จัก"</string>
<string name="color_transform" msgid="6985460408079086090">"การปรับเปลี่ยนสี"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"แสดงไทล์การตั้งค่าด่วน"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"เชื่อมต่อหูฟังแล้ว"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"เชื่อมต่อชุดหูฟังแล้ว"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"เปิดหรือปิดไอคอนจากการแสดงในแถบสถานะ"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"โปรแกรมประหยัดอินเทอร์เน็ต"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"โปรแกรมประหยัดอินเทอร์เน็ตเปิดอยู่"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"โปรแกรมประหยัดอินเทอร์เน็ตปิดอยู่"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"เปิด"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"แถบนำทาง"</string>
+ <string name="start" msgid="6873794757232879664">"บนสุด"</string>
+ <string name="center" msgid="4327473927066010960">"กึ่งกลาง"</string>
+ <string name="end" msgid="125797972524818282">"ล่างสุด"</string>
+ <string name="space" msgid="804232271282109749">"Spacer"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"ปุ่มสลับเมนู/แป้นพิมพ์"</string>
+ <string name="select_button" msgid="1597989540662710653">"เลือกปุ่มที่จะเพิ่ม"</string>
+ <string name="add_button" msgid="4134946063432258161">"เพิ่มปุ่ม"</string>
+ <string name="save" msgid="2311877285724540644">"บันทึก"</string>
+ <string name="reset" msgid="2448168080964209908">"รีเซ็ต"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"ไม่พบปุ่มหน้าแรก"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"ต้องใช้ปุ่มหน้าแรกเพื่อให้สามารถไปยังส่วนต่างๆ ในอุปกรณ์นี้ โปรดเพิ่มปุ่มหน้าแรกก่อนที่จะบันทึก"</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"ปรับความกว้างของปุ่ม"</string>
+ <string name="clipboard" msgid="1313879395099896312">"คลิปบอร์ด"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"คลิปบอร์ดช่วยให้สามารถลากรายการไปยังคลิปบอร์ดได้โดยตรง นอกจากนี้ คุณยังสามารถลากรายการออกจากคลิปบอร์ดได้โดยตรงหากมีรายการอยู่ในคลิปบอร์ด"</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"ปุ่มนำทางที่กำหนดเอง"</string>
+ <string name="keycode" msgid="7335281375728356499">"Keycode"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"ปุ่ม Keycode ช่วยให้สามารถเพิ่มแป้นของแป้นพิมพ์ไปยังแถบนำทาง เมื่อกดปุ่มนี้ ปุ่มจะเลียนแบบการทำงานของแป้นพิมพ์ที่เลือก โดยจะต้องเลือกแป้นให้กับปุ่มก่อน จากนั้นเลือกรูปภาพที่จะแสดงบนปุ่ม"</string>
+ <string name="select_keycode" msgid="7413765103381924584">"เลือกปุ่มแป้นพิมพ์"</string>
+ <string name="preview" msgid="9077832302472282938">"ดูตัวอย่าง"</string>
</resources>
diff --git a/packages/SystemUI/res/values-th/strings_tv.xml b/packages/SystemUI/res/values-th/strings_tv.xml
deleted file mode 100644
index 5921a18..0000000
--- a/packages/SystemUI/res/values-th/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"ปิด PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"เต็มหน้าจอ"</string>
- <string name="pip_play" msgid="674145557658227044">"เล่น"</string>
- <string name="pip_pause" msgid="8412075640017218862">"หยุดชั่วคราว"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"ยกเลิก"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"กดค้างที่ HOME เพื่อควบคุม PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml
index e76b40c..00aab01 100644
--- a/packages/SystemUI/res/values-tl/strings.xml
+++ b/packages/SystemUI/res/values-tl/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Walang SIM."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Naka-off ang Cellular Data"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Pag-tether ng Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Mode na eroplano."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Walang SIM card."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pagpi-pin sa screen"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"maghanap"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Hindi masimulan <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Higit pa"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> Pa"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"History"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"I-clear"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Split Horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Split Vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Split Custom"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Mga karaniwang kulay"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Madidilim na kulay"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Mga custom na kulay"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Auto"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Mga hindi kilalang kulay"</string>
<string name="color_transform" msgid="6985460408079086090">"Pagbago sa kulay"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Ipakita ang tile ng Mga Mabilisang Setting"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Nakakonekta ang mga headphone"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Nakakonekta ang headset"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"I-enable o i-disable ang pagpapakita sa mga icon sa status bar."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Data Saver"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Naka-on ang Data Saver"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Naka-off ang Data Saver"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"I-on"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigation bar"</string>
+ <string name="start" msgid="6873794757232879664">"Simula"</string>
+ <string name="center" msgid="4327473927066010960">"Gitna"</string>
+ <string name="end" msgid="125797972524818282">"Dulo"</string>
+ <string name="space" msgid="804232271282109749">"Spacer"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menu / Keyboard Switcher"</string>
+ <string name="select_button" msgid="1597989540662710653">"Pumili ng button na idaragdag"</string>
+ <string name="add_button" msgid="4134946063432258161">"Magdagdag ng button"</string>
+ <string name="save" msgid="2311877285724540644">"I-save"</string>
+ <string name="reset" msgid="2448168080964209908">"I-reset"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Walang nakitang home button"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Kailangan ng home button upang ma-navigate ang device na ito. Mangyaring magdagdag ng home button bago mag-save."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Isaayos ang lapad ng button"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Clipboard"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Nagbibigay-daan ang Clipboard na direktang ma-drag sa clipboard ang mga item. Maaari ding direktang i-drag ang mga item palabas sa clipboard."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Custom na button ng navigation"</string>
+ <string name="keycode" msgid="7335281375728356499">"Keycode"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Nagbibigay-daan ang mga button na Keycode na maidagdag ang mga keyboard key sa Navigation Bar. Kapag pinindot, ginagaya ng mga ito ang napiling keyboard key. Una, dapat munang piliin ang key para sa button, kasunod ng larawan na ipapakita sa button."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Pumili ng Button na Keyboard"</string>
+ <string name="preview" msgid="9077832302472282938">"I-preview"</string>
</resources>
diff --git a/packages/SystemUI/res/values-tl/strings_tv.xml b/packages/SystemUI/res/values-tl/strings_tv.xml
deleted file mode 100644
index 7940251..0000000
--- a/packages/SystemUI/res/values-tl/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Isara ang PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Full screen"</string>
- <string name="pip_play" msgid="674145557658227044">"I-play"</string>
- <string name="pip_pause" msgid="8412075640017218862">"I-pause"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Kanselahin"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Pindutin nang matagal ang HOME upang kontrolin ang PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml
index a16adfd..4ee97a7 100644
--- a/packages/SystemUI/res/values-tr/strings.xml
+++ b/packages/SystemUI/res/values-tr/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Kablosuz"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"SIM kart yok."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Hücresel Veri Kapalı"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth tethering"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Uçak modu."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"SIM kart yok."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ekran sabitleme"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ara"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> başlatılamadı."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Diğer"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> Tane Daha"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Geçmiş"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Sil"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Yatay Ayırma"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Dikey Ayırma"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Özel Ayırma"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Normal renkler"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Gece renkleri"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Özel renkler"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Otomatik"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Bilinmeyen renkler"</string>
<string name="color_transform" msgid="6985460408079086090">"Renk değişikliği"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Hızlı Ayarlar kutusunu göster"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Mikrofonlu kulaklık bağlı"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Mikrofonlu kulaklık bağlı"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Simgelerin durum çubuğunda görüntülenmesini etkinleştir veya devre dışı bırak"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Veri Tasarrufu"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Veri Tasarrufu açık"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Veri Tasarrufu kapalı"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Açık"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Gezinme çubuğu"</string>
+ <string name="start" msgid="6873794757232879664">"Başlangıç"</string>
+ <string name="center" msgid="4327473927066010960">"Merkez"</string>
+ <string name="end" msgid="125797972524818282">"Son"</string>
+ <string name="space" msgid="804232271282109749">"Ayırıcı"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menü / Klavye Değiştirici"</string>
+ <string name="select_button" msgid="1597989540662710653">"Eklenecek düğmeyi seçin"</string>
+ <string name="add_button" msgid="4134946063432258161">"Düğme ekle"</string>
+ <string name="save" msgid="2311877285724540644">"Kaydet"</string>
+ <string name="reset" msgid="2448168080964209908">"Sıfırla"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Ana ekran düğmesi bulunamadı"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Ana ekran düğmesi bu cihazda gezinebilmek için gereklidir. Kaydetmeden önce lütfen bir ana ekran düğmesi ekleyin."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Düğme genişliğini düzenle"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Pano"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Pano, öğelerin doğrudan panoya sürüklenmesine olanak sağlar. Panoda bulunan öğeler ayrıca doğrudan panodan dışarı sürüklenebilir."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Özel gezinme düğmesi"</string>
+ <string name="keycode" msgid="7335281375728356499">"Tuş kodu"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Tuş kodu düğmeleri klavye tuşlarının Gezinme Çubuğu\'na eklenmesini sağlar. Tuşa basıldığında, seçili klavye tuşu taklit edilir. İlgili düğme için ilk olarak tuş, ardından düğmede görüntülenecek resim seçilmelidir."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Klavye Düğmesini Seçin"</string>
+ <string name="preview" msgid="9077832302472282938">"Önizle"</string>
</resources>
diff --git a/packages/SystemUI/res/values-tr/strings_tv.xml b/packages/SystemUI/res/values-tr/strings_tv.xml
deleted file mode 100644
index 69ed9c8..0000000
--- a/packages/SystemUI/res/values-tr/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP\'yi kapat"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Tam ekran"</string>
- <string name="pip_play" msgid="674145557658227044">"Oynat"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Duraklat"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"İptal"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP\'yi kontrol etmek için ANA EKRAN düğmesini basılı tutun"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml
index 1c0e04e..ca6e39e 100644
--- a/packages/SystemUI/res/values-uk/strings.xml
+++ b/packages/SystemUI/res/values-uk/strings.xml
@@ -148,6 +148,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Немає SIM-карти."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Мобільний трафік вимкнено"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Прив’язка Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Режим польоту."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Немає SIM-карти."</string>
@@ -302,8 +303,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"закріпити екран"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"пошук"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Не вдалося запустити <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Більше"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"Ще <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Історія"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Очистити"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Розділити горизонтально"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Розділити вертикально"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Розділити (власний варіант)"</string>
@@ -469,6 +470,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Стандартні кольори"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Нічні кольори"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Користувацькі кольори"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Авто"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Невідомі кольори"</string>
<string name="color_transform" msgid="6985460408079086090">"Змінення кольорів"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Показати опцію швидких налаштувань"</string>
@@ -495,10 +497,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Навушники під’єднано"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Гарнітуру під’єднано"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Показати або сховати значки в рядку стану."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Заощадження трафіку"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Заощадження трафіку ввімкнено"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Заощадження трафіку вимкнено"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Увімкнено"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Панель навігації"</string>
+ <string name="start" msgid="6873794757232879664">"На початку"</string>
+ <string name="center" msgid="4327473927066010960">"У центрі"</string>
+ <string name="end" msgid="125797972524818282">"У кінці"</string>
+ <string name="space" msgid="804232271282109749">"Розділювач"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Вибір меню або клавіатури"</string>
+ <string name="select_button" msgid="1597989540662710653">"Виберіть, яку кнопку додати"</string>
+ <string name="add_button" msgid="4134946063432258161">"Додати кнопку"</string>
+ <string name="save" msgid="2311877285724540644">"Зберегти"</string>
+ <string name="reset" msgid="2448168080964209908">"Віднов."</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Немає кнопки \"Головний екран\""</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Для навігації пристроєм потрібна кнопка \"Головний екран\". Перш ніж зберегти, додайте цю кнопку."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Змінити ширину кнопки"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Буфер обміну"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"За допомогою кнопки \"Буфер обміну\" можна перетягувати елементи просто в буфер або з нього."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Спеціальна кнопка навігації"</string>
+ <string name="keycode" msgid="7335281375728356499">"Код клавіші"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"За допомогою кнопок кодів клавіш можна додавати клавіші клавіатури на панель навігації. Якщо натиснути кнопку, вона імітує вибрану клавішу клавіатури. Потрібно вибрати клавішу та зображення для кнопки."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Вибрати кнопку клавіатури"</string>
+ <string name="preview" msgid="9077832302472282938">"Переглянути"</string>
</resources>
diff --git a/packages/SystemUI/res/values-uk/strings_tv.xml b/packages/SystemUI/res/values-uk/strings_tv.xml
deleted file mode 100644
index d36c5bc..0000000
--- a/packages/SystemUI/res/values-uk/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Закрити PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"На весь екран"</string>
- <string name="pip_play" msgid="674145557658227044">"Відтворити"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Призупинити"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Скасувати"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Щоб керувати PIP, утримуйте кнопку \"ГОЛОВНИЙ ЕКРАН\""</string>
-</resources>
diff --git a/packages/SystemUI/res/values-ur-rPK/strings.xml b/packages/SystemUI/res/values-ur-rPK/strings.xml
index 67b52fd..415a38f 100644
--- a/packages/SystemUI/res/values-ur-rPK/strings.xml
+++ b/packages/SystemUI/res/values-ur-rPK/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"کوئی SIM نہیں ہے۔"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"سیلولر ڈیٹا آف ہے"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"بلوٹوتھ مربوط کرنا۔"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"ہوائی جہاز وضع۔"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"کوئی SIM کارڈ نہیں ہے۔"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"اسکرین کو پن کرنا"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"تلاش کریں"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> کو شروع نہیں کیا جا سکا۔"</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"مزید"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> مزید"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"سرگزشت"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"صاف کریں"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"بلحاظ افقی الگ کریں"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"بلحاظ عمودی الگ کریں"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"بلحاظ حسب ضرورت الگ کریں"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"عام رنگ"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"رات کے رنگ"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"حسب ضرورت رنگ"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"خودکار"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"نامعلوم رنگ"</string>
<string name="color_transform" msgid="6985460408079086090">"رنگوں کی تبدیلی"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"فوری ترتیبات والی ٹائل دکھائیں"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"ہیڈ فونز منسلک ہیں"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"ہیڈ سیٹ منسلک ہے"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"اسٹیٹس بار میں دکھائے جانے کیلئے آئیکنز فعال یا غیر فعال کریں۔"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"ڈیٹا سیور"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"ڈیٹا سیور آن ہے"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"ڈیٹا سیور آف ہے"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"آن"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"نیویگیشن بار"</string>
+ <string name="start" msgid="6873794757232879664">"شروع کریں"</string>
+ <string name="center" msgid="4327473927066010960">"مرکز"</string>
+ <string name="end" msgid="125797972524818282">"اختتام"</string>
+ <string name="space" msgid="804232271282109749">"سپیسر"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"مینو/ کی بورڈ سوئچر"</string>
+ <string name="select_button" msgid="1597989540662710653">"شامل کرنے کیلئے بٹن منتخب کریں"</string>
+ <string name="add_button" msgid="4134946063432258161">"بٹن شامل کریں"</string>
+ <string name="save" msgid="2311877285724540644">"محفوظ کریں"</string>
+ <string name="reset" msgid="2448168080964209908">"دوبارہ ترتیب دیں"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"کوئی ہوم بٹن نہیں ملا"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"اس آلہ کو نیویگیٹ کرنے کیلئے ایک ہوم بٹن درکار ہے۔ براہ کرم محفوظ کرنے سے پہلے ایک ہوم بٹن شامل کریں۔"</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"بٹن کی چوڑائی ایڈجسٹ کریں"</string>
+ <string name="clipboard" msgid="1313879395099896312">"کلپ بورڈ"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"کلب بورڈ آئٹمز کو براہ راست کلپ بورڈ پر گھسیٹنے کی اجازت دیتا ہے۔ کلپ بورڈ پر آئٹمز موجود ہونے کی صورت میں انہیں بھی براہ راست باہر گھسیٹا جا سکتا ہے۔"</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"حسب ضرورت نیویگیشن بٹن"</string>
+ <string name="keycode" msgid="7335281375728356499">"کی کوڈ"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"کی کوڈ بٹنز نیویگیشن بار میں کی بورڈ کلیدوں کو شامل ہونے کی اجازت دیتے ہیں۔ دبائے جانے پر یہ منتخب کردہ کی بورڈ کلید کی نقل کرتے ہیں۔ بٹن کیلئے پہلے کلید منتخب ہونی چاہیئے، اس کے بعد بٹن پر دکھائے جانے کیلئے ایک تصویر۔"</string>
+ <string name="select_keycode" msgid="7413765103381924584">"کی بورڈ بٹن منتخب کریں"</string>
+ <string name="preview" msgid="9077832302472282938">"پیش منظر"</string>
</resources>
diff --git a/packages/SystemUI/res/values-ur-rPK/strings_tv.xml b/packages/SystemUI/res/values-ur-rPK/strings_tv.xml
deleted file mode 100644
index b7af745..0000000
--- a/packages/SystemUI/res/values-ur-rPK/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP بند کریں"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"فُل اسکرین"</string>
- <string name="pip_play" msgid="674145557658227044">"چلائیں"</string>
- <string name="pip_pause" msgid="8412075640017218862">"موقوف کریں"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"منسوخ کریں"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"pip کو کنٹرول کرنے کیلئے ہوم دبا کے رکھیں"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-uz-rUZ/strings.xml b/packages/SystemUI/res/values-uz-rUZ/strings.xml
index dd91bad..4f6251e 100644
--- a/packages/SystemUI/res/values-uz-rUZ/strings.xml
+++ b/packages/SystemUI/res/values-uz-rUZ/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"SIM karta yo‘q."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Mobil internet o‘chiq"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth modem"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Parvoz rejimi"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Hech qanday SIM karta yo‘q."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"o‘zgarmas ekran"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"qidirish"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"“<xliff:g id="APP">%s</xliff:g>” ilovasini ishga tushirib bo‘lmadi."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Ko‘proq"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> ta"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Jurnal"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Tozalash"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Gorizontal yo‘nalishda bo‘lish"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Vertikal yo‘nalishda bo‘lish"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Boshqa usulda bo‘lish"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Odatiy ranglar"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Qoramtir ranglar"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Foydalanuvchi rangi"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Avtomatik"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Noma’lum ranglar"</string>
<string name="color_transform" msgid="6985460408079086090">"Rang sozlamalari"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Tezkor sozlamalar panelini ko‘rsatish"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Quloqchinlar ulandi"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Audio moslama ulandi"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Holat qatorida begilarning ko‘rsatilishini yoqish yoki o‘chirish."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Trafik tejash"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Trafik tejash yoniq"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Trafik tejash o‘chiq"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Yoniq"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigatsiya paneli"</string>
+ <string name="start" msgid="6873794757232879664">"Boshlash"</string>
+ <string name="center" msgid="4327473927066010960">"Markazda"</string>
+ <string name="end" msgid="125797972524818282">"Oxiri"</string>
+ <string name="space" msgid="804232271282109749">"Ajratuvchi"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Menyu yoki klaviatura"</string>
+ <string name="select_button" msgid="1597989540662710653">"Qo‘shish uchun tugmani tanlang"</string>
+ <string name="add_button" msgid="4134946063432258161">"Tugma qo‘shish"</string>
+ <string name="save" msgid="2311877285724540644">"Saqlash"</string>
+ <string name="reset" msgid="2448168080964209908">"Tiklash"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"“Bosh ekran” tugmasi topilmadi"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Qurilma bo‘ylab o‘tish uchun “Bosh ekran” tugmasi kerak. Saqlashdan oldin mazkur tugmani qo‘shing."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Tugma enini moslashtiring"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Vaqtinchalik xotira"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"“Vaqtinchalik xotira” tugmasi yordamida elementlarni vaqtinchalik xotiraga olish va undan chiqarish qulay."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Maxsus navigatsiya tugmasi"</string>
+ <string name="keycode" msgid="7335281375728356499">"Tugma kodi"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Tugmalar kodi yordamida klaviatura tugmalarini navigatsiya paneliga qo‘shish mumkin. Ular bosilganda tanlangan klaviatura tugmasining bosilishini taqlid qiladi. Tugmalar kodi uchun klaviatura tugmasi va rasm tanlanishi kerak."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Klaviatura tugmasini tanlang"</string>
+ <string name="preview" msgid="9077832302472282938">"Oldindan ko‘rish"</string>
</resources>
diff --git a/packages/SystemUI/res/values-uz-rUZ/strings_tv.xml b/packages/SystemUI/res/values-uz-rUZ/strings_tv.xml
deleted file mode 100644
index 7a1b69c..0000000
--- a/packages/SystemUI/res/values-uz-rUZ/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"PIP’ni yopish"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"To‘liq ekran"</string>
- <string name="pip_play" msgid="674145557658227044">"Ijro"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Pauza"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Bekor qilish"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"PIP’ni boshqarish uchun BOSHIGA tugmasini bosing"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml
index a95e312..f7ab59a 100644
--- a/packages/SystemUI/res/values-vi/strings.xml
+++ b/packages/SystemUI/res/values-vi/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Cạnh"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Không có SIM nào."</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Dữ liệu di động bị tắt"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Truy cập Internet qua Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Chế độ trên máy bay."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Không có thẻ SIM nào."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"khóa màn hình"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"tìm kiếm"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Không thể khởi động <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Thêm"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> tác vụ khác"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Lịch sử"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Xóa"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Phân tách ngang"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Phân tách dọc"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Tùy chỉnh phân tách"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Màu thông thường"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Màu tối"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Màu tùy chỉnh"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Tự động"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Màu không xác định"</string>
<string name="color_transform" msgid="6985460408079086090">"Sửa đổi màu"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Hiển thị ô Cài đặt nhanh"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Đã kết nối tai nghe"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Đã kết nối tai nghe"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Bật hoặc tắt biểu tượng hiển thị trong thanh trạng thái."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Trình tiết kiệm dữ liệu"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Trình tiết kiệm dữ liệu đang bật"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Trình tiết kiệm dữ liệu đang tắt"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Bật"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Thanh điều hướng"</string>
+ <string name="start" msgid="6873794757232879664">"Đầu"</string>
+ <string name="center" msgid="4327473927066010960">"Căn giữa"</string>
+ <string name="end" msgid="125797972524818282">"Cuối"</string>
+ <string name="space" msgid="804232271282109749">"Ký tự cách"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Trình chuyển đổi bàn phím / menu"</string>
+ <string name="select_button" msgid="1597989540662710653">"Chọn nút để thêm"</string>
+ <string name="add_button" msgid="4134946063432258161">"Thêm nút"</string>
+ <string name="save" msgid="2311877285724540644">"Lưu"</string>
+ <string name="reset" msgid="2448168080964209908">"Đặt lại"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Không tìm thấy nút trang chủ"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Cần có nút trang chủ để có thể điều hướng thiết bị này. Vui lòng thêm nút trang chủ trước khi lưu."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Điều chỉnh chiều rộng nút"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Khay nhớ tạm"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Khay nhớ tạm cho phép kéo trực tiếp mục vào khay nhớ tạm. Bạn cũng có thể kéo trực tiếp mục ra khỏi khay nhớ tạm khi hiển thị."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Nút điều hướng tùy chỉnh"</string>
+ <string name="keycode" msgid="7335281375728356499">"Mã phím"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Các nút mã phím cho phép thêm các phím trên bàn phím vào Thanh điều hướng. Khi bạn nhấn, các nút này sẽ mô phỏng phím trên bàn phím được chọn. Trước tiên, bạn phải chọn phím cho nút, sau đó chọn một hình ảnh để hiển thị trên nút."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Chọn nút trên bàn phím"</string>
+ <string name="preview" msgid="9077832302472282938">"Xem trước"</string>
</resources>
diff --git a/packages/SystemUI/res/values-vi/strings_tv.xml b/packages/SystemUI/res/values-vi/strings_tv.xml
deleted file mode 100644
index ae5f6da..0000000
--- a/packages/SystemUI/res/values-vi/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Đóng PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Toàn màn hình"</string>
- <string name="pip_play" msgid="674145557658227044">"Phát"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Tạm dừng"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Hủy"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Giữ HOME để điều khiển PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml
index e276fb5..25843f9 100644
--- a/packages/SystemUI/res/values-zh-rCN/strings.xml
+++ b/packages/SystemUI/res/values-zh-rCN/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"WLAN"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"无 SIM 卡。"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"移动数据网络已关闭"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"蓝牙网络共享。"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"飞行模式。"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"没有 SIM 卡。"</string>
@@ -300,8 +301,9 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"固定屏幕"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"搜索"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"无法启动<xliff:g id="APP">%s</xliff:g>。"</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"更多"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"还有 <xliff:g id="NUMBER">%d</xliff:g> 项"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"历史记录"</string>
+ <!-- no translation found for recents_history_clear_all_button_label (5905258334958006953) -->
+ <skip />
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"水平分割"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"垂直分割"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"自定义分割"</string>
@@ -467,6 +469,8 @@
<string name="color_matrix_none" msgid="2121957926040543148">"常规颜色"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"夜间颜色"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"自定义颜色"</string>
+ <!-- no translation found for color_matrix_auto (4896624757412029265) -->
+ <skip />
<string name="color_matrix_unknown" msgid="2709202104256265107">"未知颜色"</string>
<string name="color_transform" msgid="6985460408079086090">"颜色修改"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"显示“快捷设置”图块"</string>
@@ -493,10 +497,48 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"已连接到耳机"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"已连接到耳机"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"指定在状态栏中显示或隐藏图标。"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
+ <string name="data_saver" msgid="5037565123367048522">"流量节省程序"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"流量节省程序已开启"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"流量节省程序已关闭"</string>
+ <!-- no translation found for switch_bar_on (1142437840752794229) -->
<skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
+ <!-- no translation found for nav_bar (1993221402773877607) -->
<skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
+ <!-- no translation found for start (6873794757232879664) -->
+ <skip />
+ <!-- no translation found for center (4327473927066010960) -->
+ <skip />
+ <!-- no translation found for end (125797972524818282) -->
+ <skip />
+ <!-- no translation found for space (804232271282109749) -->
+ <skip />
+ <!-- no translation found for menu_ime (4943221416525250684) -->
+ <skip />
+ <!-- no translation found for select_button (1597989540662710653) -->
+ <skip />
+ <!-- no translation found for add_button (4134946063432258161) -->
+ <skip />
+ <!-- no translation found for save (2311877285724540644) -->
+ <skip />
+ <string name="reset" msgid="2448168080964209908">"重置"</string>
+ <!-- no translation found for no_home_title (1563808595146071549) -->
+ <skip />
+ <!-- no translation found for no_home_message (5408485011659260911) -->
+ <skip />
+ <!-- no translation found for adjust_button_width (6138616087197632947) -->
+ <skip />
+ <!-- no translation found for clipboard (1313879395099896312) -->
+ <skip />
+ <!-- no translation found for clipboard_description (3819919243940546364) -->
+ <skip />
+ <!-- no translation found for accessibility_key (5701989859305675896) -->
+ <skip />
+ <!-- no translation found for keycode (7335281375728356499) -->
+ <skip />
+ <!-- no translation found for keycode_description (1403795192716828949) -->
+ <skip />
+ <!-- no translation found for select_keycode (7413765103381924584) -->
+ <skip />
+ <!-- no translation found for preview (9077832302472282938) -->
<skip />
</resources>
diff --git a/packages/SystemUI/res/values-zh-rCN/strings_tv.xml b/packages/SystemUI/res/values-zh-rCN/strings_tv.xml
deleted file mode 100644
index 25d3ff0..0000000
--- a/packages/SystemUI/res/values-zh-rCN/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"关闭 PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"全屏"</string>
- <string name="pip_play" msgid="674145557658227044">"播放"</string>
- <string name="pip_pause" msgid="8412075640017218862">"暂停"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"取消"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"按住主屏幕图标即可控制 PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml
index 86f78e4..9d1f912 100644
--- a/packages/SystemUI/res/values-zh-rHK/strings.xml
+++ b/packages/SystemUI/res/values-zh-rHK/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"無 SIM 卡。"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"流動數據已關閉"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"藍牙網絡共享。"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"飛航模式。"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"沒有 SIM 卡。"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"螢幕固定"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"搜尋"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"無法啟動「<xliff:g id="APP">%s</xliff:g>」。"</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"更多"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"還有 <xliff:g id="NUMBER">%d</xliff:g> 項"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"記錄"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"清除"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"水平分割"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"垂直分割"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"自訂分割"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"一般色系"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"深沉色系"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"自訂顏色"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"自動"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"不明色系"</string>
<string name="color_transform" msgid="6985460408079086090">"顏色修改"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"顯示「快速設定」圖塊"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"已連接至耳機"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"已連接至耳機"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"顯示或隱藏狀態列上的圖示。"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"數據節省程式"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"數據節省程式已開啟"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"數據節省程式已關閉"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"開啟"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"導覽列"</string>
+ <string name="start" msgid="6873794757232879664">"畫面頂部"</string>
+ <string name="center" msgid="4327473927066010960">"畫面中央"</string>
+ <string name="end" msgid="125797972524818282">"畫面底部"</string>
+ <string name="space" msgid="804232271282109749">"間隔"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"選單/鍵盤切換工具"</string>
+ <string name="select_button" msgid="1597989540662710653">"選取要新增的按鈕"</string>
+ <string name="add_button" msgid="4134946063432258161">"新增按鈕"</string>
+ <string name="save" msgid="2311877285724540644">"儲存"</string>
+ <string name="reset" msgid="2448168080964209908">"重設"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"找不到主按鈕"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"您必須設定主按鈕才能操作此裝置。請先新增主按鈕，然後再儲存。"</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"調整按鈕寬度"</string>
+ <string name="clipboard" msgid="1313879395099896312">"剪貼簿"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"「剪貼簿」讓您直接將項目拖曳至剪貼簿，亦可直接將剪貼簿內現有的項目拖曳出來。"</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"自訂導覽按鈕"</string>
+ <string name="keycode" msgid="7335281375728356499">"按鍵碼"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"「按鍵碼」按鈕讓您將鍵盤按鍵新增至導覽列。按下按鈕後，系統便會執行與所選鍵盤按鍵對應的操作。如要使用此功能，請先為按鈕選取按鍵要模擬的鍵盤按鍵，然後指定按鈕的顯示圖像。"</string>
+ <string name="select_keycode" msgid="7413765103381924584">"選取鍵盤按鈕"</string>
+ <string name="preview" msgid="9077832302472282938">"預覽"</string>
</resources>
diff --git a/packages/SystemUI/res/values-zh-rHK/strings_tv.xml b/packages/SystemUI/res/values-zh-rHK/strings_tv.xml
deleted file mode 100644
index 1b46b64..0000000
--- a/packages/SystemUI/res/values-zh-rHK/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"關閉 PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"全螢幕"</string>
- <string name="pip_play" msgid="674145557658227044">"播放"</string>
- <string name="pip_pause" msgid="8412075640017218862">"暫停"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"取消"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"按住主按鈕即可控制 PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml
index 00eb788..2fc50de 100644
--- a/packages/SystemUI/res/values-zh-rTW/strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"沒有 SIM 卡。"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"行動數據連線已關閉"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"藍牙網路共用"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"飛行模式。"</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"沒有 SIM 卡。"</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"螢幕固定"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"搜尋"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"無法啟動「<xliff:g id="APP">%s</xliff:g>」。"</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"更多"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"還有 <xliff:g id="NUMBER">%d</xliff:g> 項"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"紀錄"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"清除"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"水平分割"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"垂直分割"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"自訂分割"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"一般顏色"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"夜間顏色"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"自訂顏色"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"自動"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"不明顏色"</string>
<string name="color_transform" msgid="6985460408079086090">"顏色修改"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"顯示快速設定圖塊"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"已與耳機連線"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"已與耳機連線"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"指定在狀態列中顯示或隱藏圖示。"</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Data Saver"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Data Saver 已開啟"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Data Saver 已關閉"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"開啟"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"導覽列"</string>
+ <string name="start" msgid="6873794757232879664">"畫面頂端"</string>
+ <string name="center" msgid="4327473927066010960">"畫面中央"</string>
+ <string name="end" msgid="125797972524818282">"畫面底部"</string>
+ <string name="space" msgid="804232271282109749">"空格字元"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"選單/鍵盤切換工具"</string>
+ <string name="select_button" msgid="1597989540662710653">"選取要新增的按鈕"</string>
+ <string name="add_button" msgid="4134946063432258161">"新增按鈕"</string>
+ <string name="save" msgid="2311877285724540644">"儲存"</string>
+ <string name="reset" msgid="2448168080964209908">"重設"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"找不到「主畫面」按鈕"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"您必須設定「主畫面」按鈕才能操作這部裝置。請先新增「主畫面」按鈕再儲存。"</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"調整按鈕寬度"</string>
+ <string name="clipboard" msgid="1313879395099896312">"剪貼簿"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"您可以利用「剪貼簿」按鈕將所需項目直接拖曳到剪貼簿中，或是將剪貼簿中的項目直接拖曳出來。"</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"自訂導覽按鈕"</string>
+ <string name="keycode" msgid="7335281375728356499">"按鍵碼"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"您可以利用「按鍵碼」按鈕將鍵盤按鍵加到導覽列。只要按下這些按鈕，即可執行與所選鍵盤按鍵對應的操作。如要使用這項功能，請先為按鈕選取要模擬的鍵盤按鍵，然後指定按鈕的顯示圖示。"</string>
+ <string name="select_keycode" msgid="7413765103381924584">"選取鍵盤按鍵"</string>
+ <string name="preview" msgid="9077832302472282938">"預覽"</string>
</resources>
diff --git a/packages/SystemUI/res/values-zh-rTW/strings_tv.xml b/packages/SystemUI/res/values-zh-rTW/strings_tv.xml
deleted file mode 100644
index 8a085b0..0000000
--- a/packages/SystemUI/res/values-zh-rTW/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"關閉子母畫面"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"全螢幕"</string>
- <string name="pip_play" msgid="674145557658227044">"播放"</string>
- <string name="pip_pause" msgid="8412075640017218862">"暫停"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"取消"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"按住「主畫面」圖示即可控制子母畫面"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml
index 08dc7cc..8ab2302 100644
--- a/packages/SystemUI/res/values-zu/strings.xml
+++ b/packages/SystemUI/res/values-zu/strings.xml
@@ -146,6 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Ekucupheleni"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"I-Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"Ayikho i-SIM"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Idatha yeselula ivaliwe"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Imodemu nge-Bluetooth."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Imodi yendiza."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"Alikho ikhadi le-SIM."</string>
@@ -300,8 +301,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ukuphina isikrini"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"sesha"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Ayikwazanga ukuqala i-<xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_show_history_button_label" msgid="7062088196449747245">"Okuningi"</string>
- <string name="recents_history_label_format" msgid="6337155608055062429">"<xliff:g id="NUMBER">%d</xliff:g> Okuningi"</string>
+ <string name="recents_history_button_label" msgid="5153358867807604821">"Umlando"</string>
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Sula"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Hlukanisa okuvundlile"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Hlukanisa okumile"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Hlukanisa kwezifiso"</string>
@@ -467,6 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"Imibala ejwayelekile"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"Imibala yasebusuku"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"Imibala yangokwezifiso"</string>
+ <string name="color_matrix_auto" msgid="4896624757412029265">"Okuzenzakalelayo"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"Imibala engaziwa"</string>
<string name="color_transform" msgid="6985460408079086090">"Ukulungiswa kombala"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"Bonisa ithayili lezilungiselelo ezisheshayo"</string>
@@ -493,10 +495,28 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Amahedfoni axhunyiwe"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Ama-earphone axhunyiwe"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Nika amandla noma khubaza izithonjana kusukela ekubonisweni kubha yesimo."</string>
- <!-- no translation found for data_saver (5037565123367048522) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_on (8454111686783887148) -->
- <skip />
- <!-- no translation found for accessibility_data_saver_off (8841582529453005337) -->
- <skip />
+ <string name="data_saver" msgid="5037565123367048522">"Iseva yedatha"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Iseva yedatha ivuliwe"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Iseva yedatha ivaliwe"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"Vuliwe"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Ibha yokuzula"</string>
+ <string name="start" msgid="6873794757232879664">"Qala"</string>
+ <string name="center" msgid="4327473927066010960">"Maphakathi"</string>
+ <string name="end" msgid="125797972524818282">"Phelisa"</string>
+ <string name="space" msgid="804232271282109749">"Okwenza isikhala"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Isishintshi semenyu / sekhibhodi"</string>
+ <string name="select_button" msgid="1597989540662710653">"Khetha inkinobho ongayengeza"</string>
+ <string name="add_button" msgid="4134946063432258161">"Inkinobho yokwengeza"</string>
+ <string name="save" msgid="2311877285724540644">"Londoloza"</string>
+ <string name="reset" msgid="2448168080964209908">"Setha kabusha"</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Ayikho inkinobho yasekhaya etholakele"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Inkinobho yasekhaya iyadingeka ukuthi inikwe amandla ukuze uzule kule divayisi. Sicela ungeze inkinobho yasekhaya ngaphambi kokulondoloza."</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Lungisa ububanzi benkinobho"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Ibhodi lokumanathisela"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Ibhodi lokunamathisela livumela izinto ukuthi zihudulelwe ngqo ebhodini lokunamathisela. Izinto zingahudulelwa ngqo ngaphandle kwebhodi lokunamathisela uma zikhona."</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Inkinobho yokuzula yangokwezifiso"</string>
+ <string name="keycode" msgid="7335281375728356499">"Ikhodi yokhiye"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Izinkinobho zebhodi yokhiye zivumela okhiye bekhibhodi ukuthi bangezwe kwibha yokuzula. Uma zicindezelwa zusula ukhiye wekhibhodi okhethiwe. Kokuqala ukhiye kufanele akhethelwe inkinobho, ulandelwe isithombe esizoboniswa kwinkinobho."</string>
+ <string name="select_keycode" msgid="7413765103381924584">"Khetha inkinobho yekhibhodi"</string>
+ <string name="preview" msgid="9077832302472282938">"Hlola kuqala"</string>
</resources>
diff --git a/packages/SystemUI/res/values-zu/strings_tv.xml b/packages/SystemUI/res/values-zu/strings_tv.xml
deleted file mode 100644
index 17764f4..0000000
--- a/packages/SystemUI/res/values-zu/strings_tv.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pip_exit" msgid="6423523158795119008">"Vala i-PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Iskrini esigcwele"</string>
- <string name="pip_play" msgid="674145557658227044">"Dlala"</string>
- <string name="pip_pause" msgid="8412075640017218862">"Misa isikhashana"</string>
- <string name="pip_cancel" msgid="5173898361050559462">"Khansela"</string>
- <string name="pip_hold_home" msgid="883546189749854120">"Bamba okuthi Ekhaya ukuze ulawule i-PIP"</string>
-</resources>
diff --git a/packages/SystemUI/res/values/arrays.xml b/packages/SystemUI/res/values/arrays.xml
index 32025e0..bf0cba2 100644
--- a/packages/SystemUI/res/values/arrays.xml
+++ b/packages/SystemUI/res/values/arrays.xml
@@ -51,16 +51,4 @@
<item>0</item><item>3</item>
<item>3</item><item>3</item>
</array>
-
- <!-- Used in ResolverTargetActionsDialogFragment -->
- <string-array name="resolver_target_actions_pin">
- <item>@string/pin_target</item>
- <item>@string/app_info</item>
- </string-array>
-
- <string-array name="resolver_target_actions_unpin">
- <item>@string/unpin_target</item>
- <item>@string/app_info</item>
- </string-array>
-
</resources>
diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml
index 955efb5..19bc755 100644
--- a/packages/SystemUI/res/values/attrs.xml
+++ b/packages/SystemUI/res/values/attrs.xml
@@ -28,9 +28,6 @@
<declare-styleable name="NotificationLinearLayout">
<attr name="insetLeft" format="dimension" />
</declare-styleable>
- <declare-styleable name="NotificationRowLayout">
- <attr name="rowHeight" format="dimension" />
- </declare-styleable>
<declare-styleable name="RecentsPanelView">
<attr name="recentItemLayout" format="reference" />
</declare-styleable>
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index f0d9949..9bb6dc6 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -154,4 +154,9 @@
<color name="switch_bar_background">#ff37474f</color>
<color name="switch_accent_color">#ff7fcac3</color>
+
+ <!-- Keyboard shortcuts colors -->
+ <color name="ksh_system_group_color">#ff00bcd4</color>
+ <color name="ksh_application_group_color">#fff44336</color>
+ <color name="ksh_dialog_background_color">#ffffffff</color>
</resources>
diff --git a/packages/SystemUI/res/values/colors_tv.xml b/packages/SystemUI/res/values/colors_tv.xml
new file mode 100644
index 0000000..6f4c983
--- /dev/null
+++ b/packages/SystemUI/res/values/colors_tv.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright 2016, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources>
+ <color name="recents_tv_card_background_color">#FF37474F</color>
+ <color name="recents_tv_card_title_text_color">#FFEEEEEE</color>
+ <color name="recents_tv_card_content_text_color">#99EEEEEE</color>
+ <color name="recents_tv_card_source_text_color">#99EEEEEE</color>
+</resources>
\ No newline at end of file
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 6df31ff..ebe0d97 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -103,7 +103,7 @@
<!-- The default tiles to display in QuickSettings -->
<string name="quick_settings_tiles_default" translatable="false">
- wifi,bt,flashlight,dnd,cell,battery,rotation,airplane,location,cast
+ wifi,bt,flashlight,dnd,cell,battery,rotation,airplane,location,cast,work
</string>
<!-- The tiles to display in QuickSettings -->
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 8b0350a..32d09e8 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -606,5 +606,4 @@
<dimen name="docked_divider_handle_width">16dp</dimen>
<dimen name="docked_divider_handle_height">2dp</dimen>
-
</resources>
diff --git a/packages/SystemUI/res/values/dimens_tv.xml b/packages/SystemUI/res/values/dimens_tv.xml
new file mode 100644
index 0000000..77605bd
--- /dev/null
+++ b/packages/SystemUI/res/values/dimens_tv.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright 2016, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources>
+ <!-- Dimens for recents card in the recents view on tv -->
+ <dimen name="recents_tv_card_width">150dip</dimen>
+ <dimen name="recents_tv_card_height">85dip</dimen>
+ <dimen name="recents_tv_card_extra_badge_size">16dip</dimen>
+
+ <!-- Padding for grid view in recents view on tv -->
+ <dimen name="recents_tv_grid_row_padding">56dip</dimen>
+ <dimen name="recents_tv_gird_row_top_padding">57dip</dimen>
+ <dimen name="recents_tv_grid_max_row_height">200dip</dimen>
+ <dimen name="recents_tv_gird_card_spacing">8dip</dimen>
+
+ <!-- Values for focus animation -->
+ <dimen name="recents_tv_unselected_item_z">6dp</dimen>
+ <dimen name="recents_tv_selected_item_z_delta">10dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/recents_button_bg.xml b/packages/SystemUI/res/values/integers_tv.xml
similarity index 78%
rename from packages/SystemUI/res/drawable/recents_button_bg.xml
rename to packages/SystemUI/res/values/integers_tv.xml
index 7456365..bfd8f8b 100644
--- a/packages/SystemUI/res/drawable/recents_button_bg.xml
+++ b/packages/SystemUI/res/values/integers_tv.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="#40ffffff">
-</ripple>
+<resources>
+ <integer name="item_scale_anim_duration">150</integer>
+</resources>
\ No newline at end of file
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 7824291..32da3c6 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -1343,11 +1343,6 @@
<!-- Accessibility description for data saver being off [CHAR LIMIT=NONE] -->
<string name="accessibility_data_saver_off">Data Saver is off</string>
- <!-- Resolver target actions strings -->
- <string name="pin_target">Pin</string>
- <string name="unpin_target">Unpin</string>
- <string name="app_info">App info</string>
-
<!-- Label for feature switch [CHAR LIMIT=30] -->
<string name="switch_bar_on">On</string>
diff --git a/packages/SystemUI/res/values/values_tv.xml b/packages/SystemUI/res/values/values_tv.xml
new file mode 100644
index 0000000..45cdc07
--- /dev/null
+++ b/packages/SystemUI/res/values/values_tv.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <item format="float" type="raw" name="unselected_scale">1.0</item>
+</resources>
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java
index 38ae345..a0dbad4 100755
--- a/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java
+++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java
@@ -22,12 +22,19 @@
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.database.ContentObserver;
-import android.graphics.*;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.RectF;
+import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.provider.Settings;
+
import com.android.systemui.statusbar.policy.BatteryController;
public class BatteryMeterDrawable extends Drawable implements DemoMode,
diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
index b4f63eb..0bf81e9 100644
--- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
+++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
@@ -22,6 +22,7 @@
import android.util.AttributeSet;
import android.view.View;
import android.widget.ImageView;
+
import com.android.systemui.statusbar.phone.StatusBarIconController;
import com.android.systemui.statusbar.policy.BatteryController;
import com.android.systemui.tuner.TunerService;
diff --git a/packages/SystemUI/src/com/android/systemui/DejankUtils.java b/packages/SystemUI/src/com/android/systemui/DejankUtils.java
index fc98ec4..f8ce1d3 100644
--- a/packages/SystemUI/src/com/android/systemui/DejankUtils.java
+++ b/packages/SystemUI/src/com/android/systemui/DejankUtils.java
@@ -18,7 +18,6 @@
import android.os.Handler;
import android.os.Looper;
-import android.os.StrictMode;
import android.view.Choreographer;
import java.util.ArrayList;
diff --git a/packages/SystemUI/src/com/android/systemui/DessertCaseView.java b/packages/SystemUI/src/com/android/systemui/DessertCaseView.java
index 14392b4..5e96379 100644
--- a/packages/SystemUI/src/com/android/systemui/DessertCaseView.java
+++ b/packages/SystemUI/src/com/android/systemui/DessertCaseView.java
@@ -22,7 +22,14 @@
import android.animation.ObjectAnimator;
import android.content.Context;
import android.content.res.Resources;
-import android.graphics.*;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorMatrixColorFilter;
+import android.graphics.Paint;
+import android.graphics.Point;
+import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Handler;
diff --git a/packages/SystemUI/src/com/android/systemui/GuestResumeSessionReceiver.java b/packages/SystemUI/src/com/android/systemui/GuestResumeSessionReceiver.java
index ec19e5a..9a64a41 100644
--- a/packages/SystemUI/src/com/android/systemui/GuestResumeSessionReceiver.java
+++ b/packages/SystemUI/src/com/android/systemui/GuestResumeSessionReceiver.java
@@ -16,8 +16,6 @@
package com.android.systemui;
-import com.android.systemui.statusbar.phone.SystemUIDialog;
-
import android.app.ActivityManagerNative;
import android.app.Dialog;
import android.content.BroadcastReceiver;
@@ -34,6 +32,8 @@
import android.util.Log;
import android.view.WindowManagerGlobal;
+import com.android.systemui.statusbar.phone.SystemUIDialog;
+
/**
* Manages notification when a guest session is resumed.
*/
diff --git a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
index 5a6f3c9..1306284 100644
--- a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
+++ b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
@@ -17,6 +17,7 @@
package com.android.systemui;
import static android.opengl.GLES20.*;
+
import static javax.microedition.khronos.egl.EGL10.*;
import android.app.ActivityManager;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/Interpolators.java b/packages/SystemUI/src/com/android/systemui/Interpolators.java
similarity index 89%
rename from packages/SystemUI/src/com/android/systemui/statusbar/Interpolators.java
rename to packages/SystemUI/src/com/android/systemui/Interpolators.java
index 5979468..cd6dce0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/Interpolators.java
+++ b/packages/SystemUI/src/com/android/systemui/Interpolators.java
@@ -14,9 +14,10 @@
* limitations under the License
*/
-package com.android.systemui.statusbar;
+package com.android.systemui;
import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.DecelerateInterpolator;
import android.view.animation.Interpolator;
import android.view.animation.LinearInterpolator;
import android.view.animation.PathInterpolator;
@@ -32,4 +33,5 @@
public static final Interpolator ALPHA_OUT = new PathInterpolator(0f, 0f, 0.8f, 1f);
public static final Interpolator LINEAR = new LinearInterpolator();
public static final Interpolator ACCELERATE_DECELERATE = new AccelerateDecelerateInterpolator();
+ public static final Interpolator DECELERATE_QUINT = new DecelerateInterpolator(2.5f);
}
diff --git a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
index 6b74652..33b43fe 100644
--- a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
@@ -32,7 +32,6 @@
import android.view.accessibility.AccessibilityEvent;
import com.android.systemui.classifier.FalsingManager;
-import com.android.systemui.statusbar.Interpolators;
public class SwipeHelper implements Gefingerpoken {
static final String TAG = "com.android.systemui.SwipeHelper";
diff --git a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java
index 25f8bb0..2c96e31 100644
--- a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java
@@ -25,8 +25,6 @@
import android.graphics.Paint;
import android.view.View;
-import com.android.systemui.statusbar.Interpolators;
-
import java.util.ArrayList;
/**
diff --git a/packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java b/packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java
index 0e28002..faaad2b 100644
--- a/packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java
+++ b/packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java
@@ -23,9 +23,9 @@
import java.util.ArrayList;
import static com.android.systemui.statusbar.phone.TouchAnalyticsProto.Session;
-import static com.android.systemui.statusbar.phone.TouchAnalyticsProto.Session.TouchEvent;
-import static com.android.systemui.statusbar.phone.TouchAnalyticsProto.Session.SensorEvent;
import static com.android.systemui.statusbar.phone.TouchAnalyticsProto.Session.PhoneEvent;
+import static com.android.systemui.statusbar.phone.TouchAnalyticsProto.Session.SensorEvent;
+import static com.android.systemui.statusbar.phone.TouchAnalyticsProto.Session.TouchEvent;
/**
* Collects touch, sensor and phone events and converts the data to
diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistDisclosure.java b/packages/SystemUI/src/com/android/systemui/assist/AssistDisclosure.java
index 92cd027..5878219 100644
--- a/packages/SystemUI/src/com/android/systemui/assist/AssistDisclosure.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/AssistDisclosure.java
@@ -33,8 +33,8 @@
import android.view.accessibility.AccessibilityEvent;
import android.view.animation.AnimationUtils;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
-import com.android.systemui.statusbar.Interpolators;
/**
* Visually discloses that contextual data was provided to an assistant.
diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistOrbContainer.java b/packages/SystemUI/src/com/android/systemui/assist/AssistOrbContainer.java
index 34770c4..f78436a 100644
--- a/packages/SystemUI/src/com/android/systemui/assist/AssistOrbContainer.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/AssistOrbContainer.java
@@ -22,8 +22,8 @@
import android.view.View;
import android.widget.FrameLayout;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
-import com.android.systemui.statusbar.Interpolators;
public class AssistOrbContainer extends FrameLayout {
diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistOrbView.java b/packages/SystemUI/src/com/android/systemui/assist/AssistOrbView.java
index 2d933f6..abcf27d 100644
--- a/packages/SystemUI/src/com/android/systemui/assist/AssistOrbView.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/AssistOrbView.java
@@ -32,8 +32,8 @@
import android.widget.FrameLayout;
import android.widget.ImageView;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
-import com.android.systemui.statusbar.Interpolators;
public class AssistOrbView extends FrameLayout {
diff --git a/packages/SystemUI/src/com/android/systemui/chooser/ResolverTargetActionsDialogFragment.java b/packages/SystemUI/src/com/android/systemui/chooser/ResolverTargetActionsDialogFragment.java
deleted file mode 100644
index 839aa45..0000000
--- a/packages/SystemUI/src/com/android/systemui/chooser/ResolverTargetActionsDialogFragment.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package com.android.systemui.chooser;
-
-import android.app.AlertDialog.Builder;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.content.ComponentName;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.Settings;
-
-import com.android.systemui.R;
-
-/**
- * Shows a dialog with actions to take on a chooser target
- */
-public class ResolverTargetActionsDialogFragment extends DialogFragment
- implements DialogInterface.OnClickListener {
- private static final String NAME_KEY = "componentName";
- private static final String PINNED_KEY = "pinned";
- private static final String TITLE_KEY = "title";
-
- // Sync with R.array.resolver_target_actions_* resources
- private static final int TOGGLE_PIN_INDEX = 0;
- private static final int APP_INFO_INDEX = 1;
-
- public ResolverTargetActionsDialogFragment() {
- }
-
- public ResolverTargetActionsDialogFragment(CharSequence title, ComponentName name,
- boolean pinned) {
- Bundle args = new Bundle();
- args.putCharSequence(TITLE_KEY, title);
- args.putParcelable(NAME_KEY, name);
- args.putBoolean(PINNED_KEY, pinned);
- setArguments(args);
- }
-
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState) {
- final Bundle args = getArguments();
- final int itemRes = args.getBoolean(PINNED_KEY, false)
- ? R.array.resolver_target_actions_unpin
- : R.array.resolver_target_actions_pin;
- return new Builder(getContext())
- .setCancelable(true)
- .setItems(itemRes, this)
- .setTitle(args.getCharSequence(TITLE_KEY))
- .create();
- }
-
- @Override
- public void onClick(DialogInterface dialog, int which) {
- final Bundle args = getArguments();
- ComponentName name = args.getParcelable(NAME_KEY);
- switch (which) {
- case TOGGLE_PIN_INDEX:
- SharedPreferences sp = ChooserActivity.getPinnedSharedPrefs(getContext());
- final String key = name.flattenToString();
- boolean currentVal = sp.getBoolean(name.flattenToString(), false);
- if (currentVal) {
- sp.edit().remove(key).apply();
- } else {
- sp.edit().putBoolean(key, true).apply();
- }
-
- // Force the chooser to requery and resort things
- getActivity().recreate();
- break;
- case APP_INFO_INDEX:
- Intent in = new Intent().setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
- .setData(Uri.fromParts("package", name.getPackageName(), null))
- .addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
- startActivity(in);
- break;
- }
- dismiss();
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/classifier/AnglesClassifier.java b/packages/SystemUI/src/com/android/systemui/classifier/AnglesClassifier.java
index a6ebc0b..dba731a 100644
--- a/packages/SystemUI/src/com/android/systemui/classifier/AnglesClassifier.java
+++ b/packages/SystemUI/src/com/android/systemui/classifier/AnglesClassifier.java
@@ -18,8 +18,6 @@
import android.view.MotionEvent;
-import java.lang.Math;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
diff --git a/packages/SystemUI/src/com/android/systemui/classifier/HumanInteractionClassifier.java b/packages/SystemUI/src/com/android/systemui/classifier/HumanInteractionClassifier.java
index 27d4c0e..7ddbdf0 100644
--- a/packages/SystemUI/src/com/android/systemui/classifier/HumanInteractionClassifier.java
+++ b/packages/SystemUI/src/com/android/systemui/classifier/HumanInteractionClassifier.java
@@ -19,7 +19,6 @@
import android.content.Context;
import android.database.ContentObserver;
import android.hardware.SensorEvent;
-import android.os.Build;
import android.os.Handler;
import android.os.UserHandle;
import android.provider.Settings;
@@ -35,6 +34,10 @@
public class HumanInteractionClassifier extends Classifier {
private static final String HIC_ENABLE = "HIC_enable";
private static final float FINGER_DISTANCE = 0.1f;
+
+ /** Default value for the HIC_ENABLE setting: 1 - enabled, 0 - disabled */
+ private static final int HIC_ENABLE_DEFAULT = 1;
+
private static HumanInteractionClassifier sInstance = null;
private final Handler mHandler = new Handler();
@@ -101,9 +104,9 @@
}
private void updateConfiguration() {
- mEnableClassifier = Build.IS_DEBUGGABLE && 0 != Settings.Global.getInt(
+ mEnableClassifier = 0 != Settings.Global.getInt(
mContext.getContentResolver(),
- HIC_ENABLE, 0);
+ HIC_ENABLE, HIC_ENABLE_DEFAULT);
}
public void setType(int type) {
diff --git a/packages/SystemUI/src/com/android/systemui/classifier/SpeedAnglesClassifier.java b/packages/SystemUI/src/com/android/systemui/classifier/SpeedAnglesClassifier.java
index d544a3d..d58274d 100644
--- a/packages/SystemUI/src/com/android/systemui/classifier/SpeedAnglesClassifier.java
+++ b/packages/SystemUI/src/com/android/systemui/classifier/SpeedAnglesClassifier.java
@@ -18,8 +18,6 @@
import android.view.MotionEvent;
-import java.lang.Math;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
diff --git a/packages/SystemUI/src/com/android/systemui/egg/MLand.java b/packages/SystemUI/src/com/android/systemui/egg/MLand.java
index b84777b..0fb4432 100644
--- a/packages/SystemUI/src/com/android/systemui/egg/MLand.java
+++ b/packages/SystemUI/src/com/android/systemui/egg/MLand.java
@@ -48,12 +48,11 @@
import android.widget.ImageView;
import android.widget.TextView;
-import java.util.ArrayList;
-
import com.android.internal.logging.MetricsLogger;
-
import com.android.systemui.R;
+import java.util.ArrayList;
+
// It's like LLand, but "M"ultiplayer.
public class MLand extends FrameLayout {
public static final String TAG = "MLand";
diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/BluetoothDialog.java b/packages/SystemUI/src/com/android/systemui/keyboard/BluetoothDialog.java
index 64f3e13f..5deea9b 100644
--- a/packages/SystemUI/src/com/android/systemui/keyboard/BluetoothDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/keyboard/BluetoothDialog.java
@@ -16,11 +16,9 @@
package com.android.systemui.keyboard;
-import android.app.AlertDialog;
import android.content.Context;
import android.view.WindowManager;
-import com.android.systemui.R;
import com.android.systemui.statusbar.phone.SystemUIDialog;
public class BluetoothDialog extends SystemUIDialog {
diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java b/packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java
index 481b9180..ea7270d 100644
--- a/packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java
+++ b/packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java
@@ -16,10 +16,8 @@
package com.android.systemui.keyboard;
-import android.app.AlertDialog;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothManager;
import android.bluetooth.le.BluetoothLeScanner;
import android.bluetooth.le.ScanCallback;
import android.bluetooth.le.ScanFilter;
@@ -29,7 +27,6 @@
import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
-import android.content.Intent;
import android.content.res.Configuration;
import android.hardware.input.InputManager;
import android.os.Handler;
@@ -42,7 +39,6 @@
import android.provider.Settings.Secure;
import android.text.TextUtils;
import android.util.Slog;
-import android.view.WindowManager;
import com.android.settingslib.bluetooth.BluetoothCallback;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -58,7 +54,6 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import java.util.Map;
import java.util.Set;
public class KeyboardUI extends SystemUI implements InputManager.OnTabletModeChangedListener {
diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java
index adc9b36..b2a80f4 100644
--- a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java
@@ -23,24 +23,23 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.graphics.Typeface;
-import android.media.projection.MediaProjectionManager;
-import android.media.projection.IMediaProjectionManager;
import android.media.projection.IMediaProjection;
+import android.media.projection.IMediaProjectionManager;
+import android.media.projection.MediaProjectionManager;
import android.os.Bundle;
import android.os.IBinder;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.text.BidiFormatter;
-import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextPaint;
import android.text.TextUtils;
import android.text.style.StyleSpan;
import android.util.Log;
-import android.util.TypedValue;
import android.view.WindowManager;
import android.widget.CheckBox;
import android.widget.CompoundButton;
+
import com.android.systemui.R;
public class MediaProjectionPermissionActivity extends Activity
diff --git a/packages/SystemUI/src/com/android/systemui/net/NetworkOverLimitActivity.java b/packages/SystemUI/src/com/android/systemui/net/NetworkOverLimitActivity.java
index b3c0783..f201165 100644
--- a/packages/SystemUI/src/com/android/systemui/net/NetworkOverLimitActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/net/NetworkOverLimitActivity.java
@@ -16,11 +16,6 @@
package com.android.systemui.net;
-import static android.net.NetworkPolicyManager.EXTRA_NETWORK_TEMPLATE;
-import static android.net.NetworkTemplate.MATCH_MOBILE_3G_LOWER;
-import static android.net.NetworkTemplate.MATCH_MOBILE_4G;
-import static android.net.NetworkTemplate.MATCH_MOBILE_ALL;
-
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -37,6 +32,11 @@
import com.android.systemui.R;
+import static android.net.NetworkPolicyManager.EXTRA_NETWORK_TEMPLATE;
+import static android.net.NetworkTemplate.MATCH_MOBILE_3G_LOWER;
+import static android.net.NetworkTemplate.MATCH_MOBILE_4G;
+import static android.net.NetworkTemplate.MATCH_MOBILE_ALL;
+
/**
* Notify user that a {@link NetworkTemplate} is over its
* {@link NetworkPolicy#limitBytes}, giving them the choice of acknowledging or
diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
index 6bc8b50..d723367 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
@@ -6,6 +6,7 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+
import com.android.internal.widget.PagerAdapter;
import com.android.internal.widget.ViewPager;
import com.android.systemui.R;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/PseudoGridView.java b/packages/SystemUI/src/com/android/systemui/qs/PseudoGridView.java
index 699273a..a1c2577 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/PseudoGridView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/PseudoGridView.java
@@ -16,8 +16,6 @@
package com.android.systemui.qs;
-import com.android.systemui.R;
-
import android.content.Context;
import android.content.res.TypedArray;
import android.database.DataSetObserver;
@@ -26,6 +24,8 @@
import android.view.ViewGroup;
import android.widget.BaseAdapter;
+import com.android.systemui.R;
+
import java.lang.ref.WeakReference;
/**
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSIconView.java b/packages/SystemUI/src/com/android/systemui/qs/QSIconView.java
index 7651ae8..ed90904 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSIconView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSIconView.java
@@ -23,6 +23,7 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
+
import com.android.systemui.R;
import java.util.Objects;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
index 789e72e..35000d3 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
@@ -16,6 +16,7 @@
package com.android.systemui.qs;
+import android.app.ActivityManager;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
@@ -23,7 +24,6 @@
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
-import android.os.UserHandle;
import android.util.Log;
import android.util.SparseArray;
import android.view.View;
@@ -271,7 +271,7 @@
protected void checkIfRestrictionEnforced(State state, String userRestriction) {
EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
- userRestriction, UserHandle.myUserId());
+ userRestriction, ActivityManager.getCurrentUser());
if (admin != null) {
state.disabledByPolicy = true;
state.enforcedAdmin = admin;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java
index 68461f5..1a854c2 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java
@@ -24,6 +24,7 @@
import android.os.Message;
import android.view.View;
import android.widget.LinearLayout;
+
import com.android.systemui.R;
public class QSTileBaseView extends LinearLayout {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
index 664ca39..0d5d115 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
@@ -25,6 +25,7 @@
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
+
import com.android.systemui.FontSizeUtils;
import com.android.systemui.R;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java
index b391c1e..753efb0 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java
@@ -23,6 +23,7 @@
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
+
import com.android.systemui.R;
import java.util.ArrayList;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java
index 59a394f..f7e2338 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java
@@ -5,6 +5,7 @@
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
+
import com.android.systemui.R;
import com.android.systemui.qs.QSPanel.QSTileLayout;
import com.android.systemui.qs.QSPanel.TileRecord;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/CustomQSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/customize/CustomQSPanel.java
index eab4dca..02cb0cf 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/CustomQSPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/CustomQSPanel.java
@@ -27,6 +27,7 @@
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
+
import com.android.systemui.R;
import com.android.systemui.qs.QSPanel;
import com.android.systemui.qs.QSTile;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/NonPagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/customize/NonPagedTileLayout.java
index 8f0d194..98c7be4 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/NonPagedTileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/NonPagedTileLayout.java
@@ -25,6 +25,7 @@
import android.view.View;
import android.view.View.OnTouchListener;
import android.widget.LinearLayout;
+
import com.android.systemui.R;
import com.android.systemui.qs.PagedTileLayout;
import com.android.systemui.qs.PagedTileLayout.TilePage;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
index cc4ce70..a6c7fe4 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
@@ -37,6 +37,7 @@
import android.widget.ListView;
import android.widget.Toolbar;
import android.widget.Toolbar.OnMenuItemClickListener;
+
import com.android.systemui.R;
import com.android.systemui.qs.QSDetailClipper;
import com.android.systemui.qs.QSTile.Host.Callback;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
index 3748a30..a4d7e93 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
@@ -37,6 +37,7 @@
import android.widget.GridLayout;
import android.widget.ImageView;
import android.widget.TextView;
+
import com.android.systemui.R;
import com.android.systemui.qs.QSTile;
import com.android.systemui.qs.QSTile.Icon;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java
index 886531a..0e75e2b 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java
@@ -100,6 +100,15 @@
mIsShowingDialog = true;
}
+ public void onDialogHidden() {
+ mIsShowingDialog = false;
+ try {
+ if (DEBUG) Log.d(TAG, "Removing token");
+ mWindowManager.removeWindowToken(mToken);
+ } catch (RemoteException e) {
+ }
+ }
+
@Override
public void setListening(boolean listening) {
if (mListening == listening) return;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java
index 4977d80..c4436f4 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java
@@ -15,6 +15,8 @@
*/
package com.android.systemui.qs.external;
+import libcore.util.Objects;
+
import android.app.AppGlobals;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@@ -35,7 +37,6 @@
import android.support.annotation.VisibleForTesting;
import android.util.ArraySet;
import android.util.Log;
-import libcore.util.Objects;
import java.util.Set;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java
index 2f77a30..5cf1e21 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java
@@ -52,6 +52,7 @@
private boolean mJustBound;
private long mLastUpdate;
private int mType;
+ private boolean mShowingDialog;
TileServiceManager(TileServices tileServices, Handler handler, ComponentName component) {
this(tileServices, handler, new TileLifecycleManager(handler,
@@ -86,6 +87,10 @@
mServices.recalculateBindAllowance();
}
+ public void setShowingDialog(boolean dialog) {
+ mShowingDialog = dialog;
+ }
+
public IQSTileService getTileService() {
return mStateManager;
}
@@ -153,10 +158,13 @@
// Pending click is the most important thing, need to put this service at the top of
// the list to be bound.
mPriority = Integer.MAX_VALUE;
+ } else if (mShowingDialog) {
+ // Hang on to services that are showing dialogs so they don't die.
+ mPriority = Integer.MAX_VALUE - 1;
} else if (mJustBound) {
// If we just bound, lets not thrash on binding/unbinding too much, this is second most
// important.
- mPriority = Integer.MAX_VALUE - 1;
+ mPriority = Integer.MAX_VALUE - 2;
} else if (!mBindRequested) {
// Don't care about binding right now, put us last.
mPriority = Integer.MIN_VALUE;
@@ -165,8 +173,8 @@
long timeSinceUpdate = currentTime - mLastUpdate;
// Fit compare into integer space for simplicity. Make sure to leave MAX_VALUE and
// MAX_VALUE - 1 for the more important states above.
- if (timeSinceUpdate > Integer.MAX_VALUE - 2) {
- mPriority = Integer.MAX_VALUE - 2;
+ if (timeSinceUpdate > Integer.MAX_VALUE - 3) {
+ mPriority = Integer.MAX_VALUE - 3;
} else {
mPriority = (int) timeSinceUpdate;
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
index 44d8776..bfa4a32 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
@@ -33,6 +33,7 @@
import android.service.quicksettings.TileService;
import android.util.ArrayMap;
import android.util.Log;
+
import com.android.internal.statusbar.StatusBarIcon;
import com.android.systemui.statusbar.phone.QSTileHost;
import com.android.systemui.statusbar.phone.StatusBarIconController;
@@ -196,6 +197,18 @@
if (customTile != null) {
customTile.onDialogShown();
mHost.collapsePanels();
+ mServices.get(customTile).setShowingDialog(true);
+ }
+ }
+
+ @Override
+ public void onDialogHidden(Tile tile) {
+ ComponentName componentName = tile.getComponentName();
+ verifyCaller(componentName.getPackageName());
+ CustomTile customTile = getTileForComponent(componentName);
+ if (customTile != null) {
+ mServices.get(customTile).setShowingDialog(false);
+ customTile.onDialogHidden();
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java
index fd8857d..64b3a6c 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java
@@ -25,6 +25,7 @@
import android.widget.Checkable;
import android.widget.ImageView;
import android.widget.TextView;
+
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settingslib.BatteryInfo;
import com.android.systemui.BatteryMeterDrawable;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
index 6a07a07..874fc3e 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
@@ -34,6 +34,7 @@
import com.android.systemui.qs.QSTile;
import com.android.systemui.statusbar.policy.BluetoothController;
+import java.util.ArrayList;
import java.util.Collection;
/** Quick settings tile: Bluetooth **/
@@ -78,6 +79,10 @@
@Override
protected void handleClick() {
+ if (!mController.canConfigBluetooth()) {
+ mHost.startActivityDismissingKeyguard(new Intent(Settings.ACTION_BLUETOOTH_SETTINGS));
+ return;
+ }
if (!mState.value) {
mState.value = true;
mController.setBluetoothEnabled(true);
@@ -213,11 +218,9 @@
private void updateItems() {
if (mItems == null) return;
- Item[] items = null;
+ ArrayList<Item> items = new ArrayList<Item>();
final Collection<CachedBluetoothDevice> devices = mController.getDevices();
if (devices != null) {
- items = new Item[getBondedCount(devices)];
- int i = 0;
for (CachedBluetoothDevice device : devices) {
if (device.getBondState() == BluetoothDevice.BOND_NONE) continue;
final Item item = new Item();
@@ -233,20 +236,10 @@
item.line2 = mContext.getString(R.string.quick_settings_connecting);
}
item.tag = device;
- items[i++] = item;
+ items.add(item);
}
}
- mItems.setItems(items);
- }
-
- private int getBondedCount(Collection<CachedBluetoothDevice> devices) {
- int ct = 0;
- for (CachedBluetoothDevice device : devices) {
- if (device.getBondState() != BluetoothDevice.BOND_NONE) {
- ct++;
- }
- }
- return ct;
+ mItems.setItems(items.toArray(new Item[items.size()]));
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java
index 2be43c0..bad4e79 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java
@@ -23,6 +23,7 @@
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
+
import com.android.settingslib.net.DataUsageController;
import com.android.systemui.FontSizeUtils;
import com.android.systemui.R;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java
index 1f9f1c4..f99a3e4 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java
@@ -29,13 +29,11 @@
import android.view.View;
import android.view.View.OnAttachStateChangeListener;
import android.view.ViewGroup;
-import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.systemui.Prefs;
import com.android.systemui.R;
-import com.android.systemui.SysUIToast;
import com.android.systemui.qs.QSTile;
import com.android.systemui.statusbar.policy.ZenModeController;
import com.android.systemui.volume.ZenModePanel;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
index db86047..2f37943 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
@@ -16,6 +16,8 @@
package com.android.systemui.qs.tiles;
+import android.os.UserManager;
+
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.systemui.R;
@@ -66,6 +68,8 @@
protected void handleUpdateState(BooleanState state, Object arg) {
state.label = mContext.getString(R.string.quick_settings_hotspot_label);
+ state.disabledByPolicy = mController.isTetheringAllowed();
+ checkIfRestrictionEnforced(state, UserManager.DISALLOW_CONFIG_TETHERING);
if (arg instanceof Boolean) {
state.value = (boolean) arg;
} else {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java
index 724659c..8328897 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java
@@ -16,6 +16,8 @@
package com.android.systemui.qs.tiles;
+import android.os.UserManager;
+
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.systemui.R;
@@ -85,6 +87,8 @@
// bug is fixed, this should be reverted to only hiding it on secure lock screens:
// state.visible = !(mKeyguard.isSecure() && mKeyguard.isShowing());
state.value = locationEnabled;
+ state.disabledByPolicy = mController.isUserLocationRestricted();
+ checkIfRestrictionEnforced(state, UserManager.DISALLOW_SHARE_LOCATION);
if (locationEnabled) {
state.icon = mEnable;
state.label = mContext.getString(R.string.quick_settings_location_label);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java
index 167c611..33befd0 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java
@@ -16,11 +16,6 @@
package com.android.systemui.qs.tiles;
-import com.android.internal.util.ArrayUtils;
-import com.android.systemui.FontSizeUtils;
-import com.android.systemui.R;
-import com.android.systemui.statusbar.phone.UserAvatarView;
-
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.TypedArray;
@@ -34,6 +29,11 @@
import android.widget.LinearLayout;
import android.widget.TextView;
+import com.android.internal.util.ArrayUtils;
+import com.android.systemui.FontSizeUtils;
+import com.android.systemui.R;
+import com.android.systemui.statusbar.phone.UserAvatarView;
+
/**
* Displays one user in the {@link UserDetailView} view.
*/
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java
index 6eb0646..1565b6f 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.util.Pair;
+
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.systemui.qs.QSTile;
import com.android.systemui.statusbar.policy.UserInfoController;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/Recents.java b/packages/SystemUI/src/com/android/systemui/recents/Recents.java
index b8310f2..e4fd31d 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/Recents.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/Recents.java
@@ -34,6 +34,7 @@
import android.util.Log;
import android.view.Display;
import android.view.View;
+
import com.android.systemui.RecentsComponent;
import com.android.systemui.SystemUI;
import com.android.systemui.recents.events.EventBus;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
index c3b794d..d01a288 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
@@ -532,9 +532,9 @@
}
@Override
- public void onMultiWindowModeChanged(boolean multiWindowMode) {
- super.onMultiWindowModeChanged(multiWindowMode);
- if (!multiWindowMode) {
+ public void onMultiWindowChanged(boolean inMultiWindow) {
+ super.onMultiWindowChanged(inMultiWindow);
+ if (!inMultiWindow) {
RecentsTaskLoader loader = Recents.getTaskLoader();
RecentsTaskLoadPlan.Options launchOpts = new RecentsTaskLoadPlan.Options();
launchOpts.loadIcons = false;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsAppWidgetHost.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsAppWidgetHost.java
index 573db98..318c69f 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsAppWidgetHost.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsAppWidgetHost.java
@@ -20,6 +20,7 @@
import android.appwidget.AppWidgetHostView;
import android.appwidget.AppWidgetProviderInfo;
import android.content.Context;
+
import com.android.systemui.recents.events.EventBus;
import com.android.systemui.recents.events.activity.AppWidgetProviderChangedEvent;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java
index 61780f8..0115f91 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Rect;
+
import com.android.systemui.R;
import com.android.systemui.recents.misc.SystemServicesProxy;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsDebugFlags.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsDebugFlags.java
index 49f2ab0..6b8968f 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsDebugFlags.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsDebugFlags.java
@@ -17,6 +17,7 @@
package com.android.systemui.recents;
import android.content.Context;
+
import com.android.systemui.recents.events.EventBus;
import com.android.systemui.recents.events.activity.DebugFlagsChangedEvent;
import com.android.systemui.recents.misc.SystemServicesProxy;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
index b78fd22..5a60a19 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
@@ -19,10 +19,12 @@
import android.app.ActivityManager;
import android.app.ActivityOptions;
import android.app.ITaskStackListener;
+import android.app.UiModeManager;
import android.appwidget.AppWidgetProviderInfo;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
+import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Canvas;
@@ -36,6 +38,7 @@
import android.view.AppTransitionAnimationSpec;
import android.view.LayoutInflater;
import android.view.View;
+
import com.android.internal.logging.MetricsLogger;
import com.android.systemui.Prefs;
import com.android.systemui.R;
@@ -87,7 +90,10 @@
public final static String RECENTS_PACKAGE = "com.android.systemui";
public final static String RECENTS_ACTIVITY = "com.android.systemui.recents.RecentsActivity";
+ public final static String RECENTS_TV_ACTIVITY = "com.android.systemui.recents.tv.RecentsTvActivity";
+ //Used to store tv or non-tv activty for use in creating intents.
+ private final String mRecentsIntentActivityName;
/**
* An implementation of ITaskStackListener, that allows us to listen for changes to the system
* task stacks and update recents accordingly.
@@ -210,6 +216,14 @@
launchOpts.numVisibleTaskThumbnails = loader.getThumbnailCacheSize();
launchOpts.onlyLoadForCache = true;
loader.loadTasks(mContext, plan, launchOpts);
+
+ //Manager used to determine if we are running on tv or not
+ UiModeManager uiModeManager = (UiModeManager) mContext.getSystemService(Context.UI_MODE_SERVICE);
+ if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION) {
+ mRecentsIntentActivityName = RECENTS_TV_ACTIVITY;
+ } else {
+ mRecentsIntentActivityName = RECENTS_ACTIVITY;
+ }
}
public void onBootCompleted() {
@@ -792,7 +806,7 @@
} else {
Canvas c = new Canvas(thumbnail);
c.scale(toTransform.scale, toTransform.scale);
- mHeaderBar.rebindToTask(toTask);
+ mHeaderBar.rebindToTask(toTask, false /* touchExplorationEnabled */);
mHeaderBar.draw(c);
c.setBitmap(null);
}
@@ -906,10 +920,11 @@
launchState.launchedViaDragGesture = mDraggingInRecents;
Intent intent = new Intent();
- intent.setClassName(RECENTS_PACKAGE, RECENTS_ACTIVITY);
+ intent.setClassName(RECENTS_PACKAGE, mRecentsIntentActivityName);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
| Intent.FLAG_ACTIVITY_TASK_ON_HOME);
+
if (opts != null) {
mContext.startActivityAsUser(intent, opts.toBundle(), UserHandle.CURRENT);
} else {
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsSystemUserService.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsSystemUserService.java
index 39d0d59..2c1158d 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsSystemUserService.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsSystemUserService.java
@@ -20,6 +20,7 @@
import android.content.Intent;
import android.os.IBinder;
import android.util.Log;
+
import com.android.systemui.SystemUIApplication;
/**
diff --git a/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java b/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java
index 10075bc..13d4acb 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java
@@ -39,6 +39,7 @@
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.TextView;
+
import com.android.systemui.R;
import java.util.ArrayList;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/EventBus.java b/packages/SystemUI/src/com/android/systemui/recents/events/EventBus.java
index 212c7f4..0d56ae9 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/events/EventBus.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/EventBus.java
@@ -27,6 +27,7 @@
import android.os.UserHandle;
import android.util.Log;
import android.util.MutableBoolean;
+
import com.android.systemui.recents.misc.ReferenceCountedTrigger;
import java.lang.ref.WeakReference;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/activity/LaunchTaskEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/activity/LaunchTaskEvent.java
index 21b9301..3db106e 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/events/activity/LaunchTaskEvent.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/activity/LaunchTaskEvent.java
@@ -17,6 +17,7 @@
package com.android.systemui.recents.events.activity;
import android.graphics.Rect;
+
import com.android.systemui.recents.events.EventBus;
import com.android.systemui.recents.model.Task;
import com.android.systemui.recents.views.TaskView;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/activity/TaskStackUpdatedEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/activity/TaskStackUpdatedEvent.java
index 7579cd8..f87f6de 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/events/activity/TaskStackUpdatedEvent.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/activity/TaskStackUpdatedEvent.java
@@ -22,7 +22,7 @@
/**
* This is sent by the activity whenever the task stach has changed.
*/
-public class TaskStackUpdatedEvent extends EventBus.Event {
+public class TaskStackUpdatedEvent extends EventBus.AnimatedEvent {
/**
* A new TaskStack instance representing the latest stack state.
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/component/RecentsVisibilityChangedEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/component/RecentsVisibilityChangedEvent.java
index 898d1fc..4140bcd 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/events/component/RecentsVisibilityChangedEvent.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/component/RecentsVisibilityChangedEvent.java
@@ -17,6 +17,7 @@
package com.android.systemui.recents.events.component;
import android.content.Context;
+
import com.android.systemui.recents.events.EventBus;
import com.android.systemui.recents.misc.SystemServicesProxy;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/component/ScreenPinningRequestEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/component/ScreenPinningRequestEvent.java
index f9ccfc8..75e459a 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/events/component/ScreenPinningRequestEvent.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/component/ScreenPinningRequestEvent.java
@@ -17,6 +17,7 @@
package com.android.systemui.recents.events.component;
import android.content.Context;
+
import com.android.systemui.recents.events.EventBus;
/**
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/ui/StackViewScrolledEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/ui/StackViewScrolledEvent.java
index ad9feb6..c4b47c0 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/events/ui/StackViewScrolledEvent.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/ui/StackViewScrolledEvent.java
@@ -17,6 +17,7 @@
package com.android.systemui.recents.events.ui;
import android.util.MutableInt;
+
import com.android.systemui.recents.events.EventBus;
/**
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/ui/dragndrop/DragStartEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/ui/dragndrop/DragStartEvent.java
index b81c10c..b368bd3 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/events/ui/dragndrop/DragStartEvent.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/ui/dragndrop/DragStartEvent.java
@@ -17,6 +17,7 @@
package com.android.systemui.recents.events.ui.dragndrop;
import android.graphics.Point;
+
import com.android.systemui.recents.events.EventBus;
import com.android.systemui.recents.model.Task;
import com.android.systemui.recents.views.TaskView;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/ui/dragndrop/DragStartInitializeDropTargetsEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/ui/dragndrop/DragStartInitializeDropTargetsEvent.java
index b450b1f..7030729 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/events/ui/dragndrop/DragStartInitializeDropTargetsEvent.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/ui/dragndrop/DragStartInitializeDropTargetsEvent.java
@@ -19,6 +19,7 @@
import com.android.systemui.recents.events.EventBus;
import com.android.systemui.recents.model.Task;
import com.android.systemui.recents.views.RecentsViewTouchHandler;
+import com.android.systemui.recents.views.TaskView;
/**
* This event is sent by the drag manager when it requires drop targets to register themselves for
@@ -27,10 +28,13 @@
public class DragStartInitializeDropTargetsEvent extends EventBus.Event {
public final Task task;
+ public final TaskView taskView;
public final RecentsViewTouchHandler handler;
- public DragStartInitializeDropTargetsEvent(Task task, RecentsViewTouchHandler handler) {
+ public DragStartInitializeDropTargetsEvent(Task task, TaskView taskView,
+ RecentsViewTouchHandler handler) {
this.task = task;
+ this.taskView = taskView;
this.handler = handler;
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryItemTouchCallbacks.java b/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryItemTouchCallbacks.java
index a91ea7e..acad0ea 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryItemTouchCallbacks.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryItemTouchCallbacks.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.helper.ItemTouchHelper;
+
import com.android.internal.logging.MetricsLogger;
import com.android.systemui.recents.Constants;
import com.android.systemui.recents.events.EventBus;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryView.java b/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryView.java
index 96b5cac..843adc1 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryView.java
@@ -26,12 +26,11 @@
import android.util.AttributeSet;
import android.view.View;
import android.view.WindowInsets;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
import android.widget.LinearLayout;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsActivity;
@@ -61,8 +60,6 @@
private Rect mSystemInsets = new Rect();
private int mHeaderHeight;
- private Interpolator mFastOutSlowInInterpolator;
- private Interpolator mFastOutLinearInInterpolator;
private int mHistoryTransitionDuration;
public RecentsHistoryView(Context context) {
@@ -84,10 +81,6 @@
mAdapter = new RecentsHistoryAdapter(context);
mItemTouchHandler = new RecentsHistoryItemTouchCallbacks(context, mAdapter);
mHistoryTransitionDuration = res.getInteger(R.integer.recents_history_transition_duration);
- mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
- com.android.internal.R.interpolator.fast_out_slow_in);
- mFastOutLinearInInterpolator = AnimationUtils.loadInterpolator(context,
- com.android.internal.R.interpolator.fast_out_linear_in);
mViewBounds = new AnimateableViewBounds(this, 0);
setOutlineProvider(mViewBounds);
}
@@ -103,7 +96,7 @@
.alpha(1f)
.translationY(0f)
.setDuration(mHistoryTransitionDuration)
- .setInterpolator(mFastOutSlowInInterpolator)
+ .setInterpolator(Interpolators.FAST_OUT_SLOW_IN)
.setUpdateListener(this)
.start();
clearAllButton.setVisibility(View.VISIBLE);
@@ -111,7 +104,7 @@
clearAllButton.animate()
.alpha(1f)
.setDuration(mHistoryTransitionDuration)
- .setInterpolator(mFastOutSlowInInterpolator)
+ .setInterpolator(Interpolators.FAST_OUT_SLOW_IN)
.withLayer()
.start();
mAdapter.updateTasks(getContext(), stack);
@@ -130,7 +123,7 @@
.alpha(0f)
.translationY(-stackHeight * TRANSLATION_Y_PCT)
.setDuration(mHistoryTransitionDuration)
- .setInterpolator(mFastOutLinearInInterpolator)
+ .setInterpolator(Interpolators.FAST_OUT_LINEAR_IN)
.setUpdateListener(this)
.withEndAction(new Runnable() {
@Override
@@ -143,7 +136,7 @@
.alpha(0f)
.translationY(0f)
.setDuration(mHistoryTransitionDuration)
- .setInterpolator(mFastOutSlowInInterpolator)
+ .setInterpolator(Interpolators.FAST_OUT_SLOW_IN)
.withEndAction(new Runnable() {
@Override
public void run() {
diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
index 2882cec..d22cd53 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
@@ -65,6 +65,7 @@
import android.view.WindowManager.KeyboardShortcutsReceiver;
import android.view.WindowManagerGlobal;
import android.view.accessibility.AccessibilityManager;
+
import com.android.internal.app.AssistUtils;
import com.android.internal.os.BackgroundThread;
import com.android.systemui.Prefs;
@@ -81,6 +82,7 @@
import static android.app.ActivityManager.StackId.DOCKED_STACK_ID;
import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID;
import static android.app.ActivityManager.StackId.HOME_STACK_ID;
+import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
import static android.provider.Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT;
/**
@@ -254,8 +256,6 @@
* Returns whether this device has freeform workspaces.
*/
public boolean hasFreeformWorkspaceSupport() {
- if (mPm == null) return false;
-
return mHasFreeformWorkspaceSupport;
}
@@ -266,8 +266,9 @@
ComponentName topActivity = topTask.topActivity;
// Check if the front most activity is recents
- if (topActivity.getPackageName().equals(RecentsImpl.RECENTS_PACKAGE) &&
- topActivity.getClassName().equals(RecentsImpl.RECENTS_ACTIVITY)) {
+ if ((topActivity.getPackageName().equals(RecentsImpl.RECENTS_PACKAGE) &&
+ (topActivity.getClassName().equals(RecentsImpl.RECENTS_ACTIVITY) ||
+ topActivity.getClassName().equals(RecentsImpl.RECENTS_TV_ACTIVITY)))) {
if (isHomeTopMost != null) {
isHomeTopMost.value = false;
}
@@ -356,6 +357,13 @@
}
/**
+ * Returns whether the given stack id is the pinned stack id.
+ */
+ public static boolean isPinnedStack(int stackId){
+ return stackId == PINNED_STACK_ID;
+ }
+
+ /**
* Returns whether the given stack id is the docked stack id.
*/
public static boolean isDockedStack(int stackId) {
@@ -968,4 +976,20 @@
public void requestKeyboardShortcuts(Context context, KeyboardShortcutsReceiver receiver) {
mWm.requestAppKeyboardShortcuts(receiver);
}
+
+ public void focusPinnedStack() {
+ try {
+ mIam.setFocusedStack(PINNED_STACK_ID);
+ } catch (RemoteException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void focusHomeStack() {
+ try {
+ mIam.setFocusedStack(HOME_STACK_ID);
+ } catch (RemoteException e) {
+ e.printStackTrace();
+ }
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/Utilities.java b/packages/SystemUI/src/com/android/systemui/recents/misc/Utilities.java
index f3c4cc3..4deea54 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/misc/Utilities.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/misc/Utilities.java
@@ -26,6 +26,7 @@
import android.util.Property;
import android.view.View;
import android.view.ViewParent;
+
import com.android.systemui.recents.model.Task;
import com.android.systemui.recents.views.TaskViewTransform;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsPackageMonitor.java b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsPackageMonitor.java
index d9057b8..1f82c16 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsPackageMonitor.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsPackageMonitor.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.os.UserHandle;
+
import com.android.internal.content.PackageMonitor;
import com.android.internal.os.BackgroundThread;
import com.android.systemui.recents.events.EventBus;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java
index 3029acf..4e08bc2 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java
@@ -22,12 +22,12 @@
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
-import android.os.Debug;
import android.os.UserHandle;
import android.os.UserManager;
import android.util.ArraySet;
import android.util.SparseArray;
import android.util.SparseIntArray;
+
import com.android.systemui.Prefs;
import com.android.systemui.R;
import com.android.systemui.recents.Recents;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java
index 5c77d8a..26130ab 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java
@@ -29,6 +29,7 @@
import android.os.HandlerThread;
import android.util.Log;
import android.util.LruCache;
+
import com.android.systemui.R;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsConfiguration;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/Task.java b/packages/SystemUI/src/com/android/systemui/recents/model/Task.java
index 193bd17..1c277d5 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/model/Task.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/model/Task.java
@@ -23,6 +23,7 @@
import android.graphics.Color;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
+
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.misc.SystemServicesProxy;
import com.android.systemui.recents.misc.Utilities;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java b/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java
index 66eeac6..aa8efa7 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java
@@ -33,6 +33,7 @@
import android.util.ArraySet;
import android.util.SparseArray;
import android.view.animation.Interpolator;
+
import com.android.internal.policy.DockedDividerUtils;
import com.android.systemui.R;
import com.android.systemui.recents.Recents;
@@ -399,7 +400,12 @@
// Calculate the task stack bounds from the new window bounds
Rect searchBarSpaceBounds = new Rect();
Rect taskStackBounds = new Rect();
- config.getTaskStackBounds(newWindowBounds, insets.top, insets.right,
+ // If the task stack bounds is specifically under the dock area, then ignore the top
+ // inset
+ int top = dockArea.bottom < 1f
+ ? 0
+ : insets.top;
+ config.getTaskStackBounds(newWindowBounds, top, insets.right,
searchBarSpaceBounds, taskStackBounds);
return taskStackBounds;
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java b/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java
new file mode 100644
index 0000000..fb86214
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java
@@ -0,0 +1,438 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.recents.tv;
+
+import android.app.Activity;
+import android.app.ActivityOptions;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewTreeObserver.OnPreDrawListener;
+import android.view.WindowManager;
+
+import com.android.systemui.R;
+import com.android.systemui.recents.Recents;
+import com.android.systemui.recents.RecentsActivityLaunchState;
+import com.android.systemui.recents.RecentsConfiguration;
+import com.android.systemui.recents.RecentsImpl;
+import com.android.systemui.recents.events.EventBus;
+import com.android.systemui.recents.events.activity.CancelEnterRecentsWindowAnimationEvent;
+import com.android.systemui.recents.events.activity.DismissRecentsToHomeAnimationStarted;
+import com.android.systemui.recents.events.activity.EnterRecentsWindowAnimationCompletedEvent;
+import com.android.systemui.recents.events.activity.EnterRecentsWindowLastAnimationFrameEvent;
+import com.android.systemui.recents.events.activity.HideRecentsEvent;
+import com.android.systemui.recents.events.activity.LaunchTaskFailedEvent;
+import com.android.systemui.recents.events.activity.TaskStackUpdatedEvent;
+import com.android.systemui.recents.events.activity.ToggleRecentsEvent;
+import com.android.systemui.recents.events.component.RecentsVisibilityChangedEvent;
+import com.android.systemui.recents.events.ui.AllTaskViewsDismissedEvent;
+import com.android.systemui.recents.events.ui.DeleteTaskDataEvent;
+import com.android.systemui.recents.events.ui.UpdateFreeformTaskViewVisibilityEvent;
+import com.android.systemui.recents.events.ui.UserInteractionEvent;
+import com.android.systemui.recents.events.ui.focus.DismissFocusedTaskViewEvent;
+import com.android.systemui.recents.misc.SystemServicesProxy;
+import com.android.systemui.recents.model.RecentsPackageMonitor;
+import com.android.systemui.recents.model.RecentsTaskLoadPlan;
+import com.android.systemui.recents.model.RecentsTaskLoader;
+import com.android.systemui.recents.model.Task;
+import com.android.systemui.recents.model.TaskStack;
+import com.android.systemui.recents.tv.views.RecentsTvView;
+import com.android.systemui.recents.tv.views.TaskStackHorizontalViewAdapter;
+import com.android.systemui.statusbar.BaseStatusBar;
+import com.android.systemui.tv.pip.PipManager;
+
+import java.util.ArrayList;
+/**
+ * The main TV recents activity started by the RecentsImpl.
+ */
+public class RecentsTvActivity extends Activity implements OnPreDrawListener {
+ private final static String TAG = "RecentsTvActivity";
+ private final static boolean DEBUG = false;
+
+ public final static int EVENT_BUS_PRIORITY = Recents.EVENT_BUS_PRIORITY + 1;
+
+ private boolean mFinishedOnStartup;
+ private RecentsPackageMonitor mPackageMonitor;
+ private long mLastTabKeyEventTime;
+ private boolean mIgnoreAltTabRelease;
+
+ private RecentsTvView mRecentsView;
+ private TaskStackHorizontalViewAdapter mTaskStackViewAdapter;
+ private FinishRecentsRunnable mFinishLaunchHomeRunnable;
+
+
+ /**
+ * A common Runnable to finish Recents by launching Home with an animation depending on the
+ * last activity launch state. Generally we always launch home when we exit Recents rather than
+ * just finishing the activity since we don't know what is behind Recents in the task stack.
+ */
+ class FinishRecentsRunnable implements Runnable {
+ Intent mLaunchIntent;
+
+ /**
+ * Creates a finish runnable that starts the specified intent.
+ */
+ public FinishRecentsRunnable(Intent launchIntent) {
+ mLaunchIntent = launchIntent;
+ }
+
+ @Override
+ public void run() {
+ try {
+ RecentsActivityLaunchState launchState =
+ Recents.getConfiguration().getLaunchState();
+ ActivityOptions opts = ActivityOptions.makeCustomAnimation(RecentsTvActivity.this,
+ launchState.launchedFromSearchHome ?
+ R.anim.recents_to_search_launcher_enter :
+ R.anim.recents_to_launcher_enter,
+ launchState.launchedFromSearchHome ?
+ R.anim.recents_to_search_launcher_exit :
+ R.anim.recents_to_launcher_exit);
+ startActivityAsUser(mLaunchIntent, opts.toBundle(), UserHandle.CURRENT);
+ } catch (Exception e) {
+ Log.e(TAG, getString(R.string.recents_launch_error_message, "Home"), e);
+ }
+ }
+ }
+
+ private void updateRecentsTasks() {
+ RecentsTaskLoader loader = Recents.getTaskLoader();
+ RecentsTaskLoadPlan plan = RecentsImpl.consumeInstanceLoadPlan();
+ if (plan == null) {
+ plan = loader.createLoadPlan(this);
+ }
+
+ RecentsConfiguration config = Recents.getConfiguration();
+ RecentsActivityLaunchState launchState = config.getLaunchState();
+ if (!plan.hasTasks()) {
+ loader.preloadTasks(plan, -1, launchState.launchedFromHome);
+ }
+ TaskStack stack = plan.getTaskStack();
+ RecentsTaskLoadPlan.Options loadOpts = new RecentsTaskLoadPlan.Options();
+ loadOpts.runningTaskId = launchState.launchedToTaskId;
+ loadOpts.numVisibleTasks = stack.getStackTaskCount();
+ loadOpts.numVisibleTaskThumbnails = stack.getStackTaskCount();
+ loader.loadTasks(this, plan, loadOpts);
+
+
+ mRecentsView.setTaskStack(stack);
+ if (mTaskStackViewAdapter == null) {
+ mTaskStackViewAdapter = new TaskStackHorizontalViewAdapter(stack.getStackTasks());
+ mRecentsView.setTaskStackViewAdapter(mTaskStackViewAdapter);
+ } else {
+ mTaskStackViewAdapter.setNewStackTasks(stack.getStackTasks());
+ }
+
+ if (launchState.launchedToTaskId != -1) {
+ ArrayList<Task> tasks = stack.getStackTasks();
+ int taskCount = tasks.size();
+ for (int i = 0; i < taskCount; i++) {
+ Task t = tasks.get(i);
+ if (t.key.id == launchState.launchedToTaskId) {
+ t.isLaunchTarget = true;
+ break;
+ }
+ }
+ }
+ }
+
+ boolean dismissRecentsToLaunchTargetTaskOrHome() {
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ if (ssp.isRecentsTopMost(ssp.getTopMostTask(), null)) {
+ // If we have a focused Task, launch that Task now
+ if (mRecentsView.launchPreviousTask()) return true;
+ // If none of the other cases apply, then just go Home
+ dismissRecentsToHome(true /* animateTaskViews */);
+ }
+ return false;
+ }
+
+ boolean dismissRecentsToFocusedTaskOrHome() {
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ if (ssp.isRecentsTopMost(ssp.getTopMostTask(), null)) {
+ // If we have a focused Task, launch that Task now
+ if (mRecentsView.launchFocusedTask()) return true;
+ // If none of the other cases apply, then just go Home
+ dismissRecentsToHome(true /* animateTaskViews */);
+ return true;
+ }
+ return false;
+ }
+
+ void dismissRecentsToHome(boolean animateTaskViews) {
+ DismissRecentsToHomeAnimationStarted dismissEvent =
+ new DismissRecentsToHomeAnimationStarted(animateTaskViews);
+ dismissEvent.addPostAnimationCallback(mFinishLaunchHomeRunnable);
+ dismissEvent.addPostAnimationCallback(new Runnable() {
+ @Override
+ public void run() {
+ Recents.getSystemServices().sendCloseSystemWindows(
+ BaseStatusBar.SYSTEM_DIALOG_REASON_HOME_KEY);
+ }
+ });
+ EventBus.getDefault().send(dismissEvent);
+ }
+
+ boolean dismissRecentsToHomeIfVisible(boolean animated) {
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ if (ssp.isRecentsTopMost(ssp.getTopMostTask(), null)) {
+ // Return to Home
+ dismissRecentsToHome(animated);
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ mFinishedOnStartup = false;
+
+ // In the case that the activity starts up before the Recents component has initialized
+ // (usually when debugging/pushing the SysUI apk), just finish this activity.
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ if (ssp == null) {
+ mFinishedOnStartup = true;
+ finish();
+ return;
+ }
+
+ // Register this activity with the event bus
+ EventBus.getDefault().register(this, EVENT_BUS_PRIORITY);
+
+ mPackageMonitor = new RecentsPackageMonitor();
+ mPackageMonitor.register(this);
+
+ // Set the Recents layout
+ setContentView(R.layout.recents_on_tv);
+
+ mRecentsView = (RecentsTvView) findViewById(R.id.recents_view);
+ mRecentsView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
+ View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
+ View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
+
+ getWindow().getAttributes().privateFlags |=
+ WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DECOR_VIEW_VISIBILITY;
+
+ // Create the home intent runnable
+ Intent homeIntent = new Intent(Intent.ACTION_MAIN, null);
+ homeIntent.addCategory(Intent.CATEGORY_HOME);
+ homeIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
+ Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+ mFinishLaunchHomeRunnable = new FinishRecentsRunnable(homeIntent);
+ }
+
+ @Override
+ protected void onNewIntent(Intent intent) {
+ super.onNewIntent(intent);
+ setIntent(intent);
+ }
+
+ @Override
+ protected void onStart() {
+ super.onStart();
+
+ // Update the recent tasks
+ updateRecentsTasks();
+
+ // If this is a new instance from a configuration change, then we have to manually trigger
+ // the enter animation state, or if recents was relaunched by AM, without going through
+ // the normal mechanisms
+ RecentsConfiguration config = Recents.getConfiguration();
+ RecentsActivityLaunchState launchState = config.getLaunchState();
+ boolean wasLaunchedByAm = !launchState.launchedFromHome &&
+ !launchState.launchedFromAppWithThumbnail;
+ if (launchState.launchedHasConfigurationChanged || wasLaunchedByAm) {
+ EventBus.getDefault().send(new EnterRecentsWindowAnimationCompletedEvent());
+ }
+
+ // Notify that recents is now visible
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ EventBus.getDefault().send(new RecentsVisibilityChangedEvent(this, ssp, true));
+ }
+
+ @Override
+ public void onEnterAnimationComplete() {
+ super.onEnterAnimationComplete();
+ EventBus.getDefault().send(new EnterRecentsWindowAnimationCompletedEvent());
+ }
+
+ @Override
+ protected void onStop() {
+ super.onStop();
+
+ mIgnoreAltTabRelease = false;
+ // Notify that recents is now hidden
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ EventBus.getDefault().send(new RecentsVisibilityChangedEvent(this, ssp, false));
+
+ // Workaround for b/22542869, if the RecentsActivity is started again, but without going
+ // through SystemUI, we need to reset the config launch flags to ensure that we do not
+ // wait on the system to send a signal that was never queued.
+ RecentsConfiguration config = Recents.getConfiguration();
+ RecentsActivityLaunchState launchState = config.getLaunchState();
+ launchState.launchedFromHome = false;
+ launchState.launchedFromSearchHome = false;
+ launchState.launchedFromAppWithThumbnail = false;
+ launchState.launchedToTaskId = -1;
+ launchState.launchedWithAltTab = false;
+ launchState.launchedHasConfigurationChanged = false;
+ launchState.launchedViaDragGesture = false;
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+
+ // In the case that the activity finished on startup, just skip the unregistration below
+ if (mFinishedOnStartup) {
+ return;
+ }
+
+ // Unregister any broadcast receivers for the task loader
+ mPackageMonitor.unregister();
+
+ EventBus.getDefault().unregister(this);
+ }
+
+ @Override
+ public void onTrimMemory(int level) {
+ RecentsTaskLoader loader = Recents.getTaskLoader();
+ if (loader != null) {
+ loader.onTrimMemory(level);
+ }
+ }
+
+ @Override
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
+ switch (keyCode) {
+ case KeyEvent.KEYCODE_DPAD_UP: {
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ PipManager.getInstance().showPipMenu();
+ ssp.focusPinnedStack();
+ return true;
+ }
+ case KeyEvent.KEYCODE_DPAD_DOWN: {
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ PipManager.getInstance().showPipOverlay(false);
+ ssp.focusHomeStack();
+ return true;
+ }
+ case KeyEvent.KEYCODE_DEL:
+ case KeyEvent.KEYCODE_FORWARD_DEL: {
+ EventBus.getDefault().send(new DismissFocusedTaskViewEvent());
+ return true;
+ }
+ default:
+ break;
+ }
+ return super.onKeyDown(keyCode, event);
+ }
+
+ @Override
+ public void onUserInteraction() {
+ EventBus.getDefault().send(new UserInteractionEvent());
+ }
+
+ @Override
+ public void onBackPressed() {
+ // Back behaves like the recents button so just trigger a toggle event
+ EventBus.getDefault().send(new ToggleRecentsEvent());
+ }
+
+ /**** EventBus events ****/
+
+ public final void onBusEvent(ToggleRecentsEvent event) {
+ RecentsActivityLaunchState launchState = Recents.getConfiguration().getLaunchState();
+ if (launchState.launchedFromHome) {
+ dismissRecentsToHome(true /* animateTaskViews */);
+ } else {
+ dismissRecentsToLaunchTargetTaskOrHome();
+ }
+ }
+
+ public final void onBusEvent(HideRecentsEvent event) {
+ if (event.triggeredFromAltTab) {
+ // If we are hiding from releasing Alt-Tab, dismiss Recents to the focused app
+ if (!mIgnoreAltTabRelease) {
+ dismissRecentsToFocusedTaskOrHome();
+ }
+ } else if (event.triggeredFromHomeKey) {
+ dismissRecentsToHome(true /* animateTaskViews */);
+ } else {
+ // Do nothing
+ }
+ }
+
+ public final void onBusEvent(EnterRecentsWindowLastAnimationFrameEvent event) {
+ EventBus.getDefault().send(new UpdateFreeformTaskViewVisibilityEvent(true));
+ mRecentsView.getViewTreeObserver().addOnPreDrawListener(this);
+ mRecentsView.invalidate();
+ }
+
+ public final void onBusEvent(CancelEnterRecentsWindowAnimationEvent event) {
+ RecentsActivityLaunchState launchState = Recents.getConfiguration().getLaunchState();
+ int launchToTaskId = launchState.launchedToTaskId;
+ if (launchToTaskId != -1 &&
+ (event.launchTask == null || launchToTaskId != event.launchTask.key.id)) {
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ ssp.cancelWindowTransition(launchState.launchedToTaskId);
+ ssp.cancelThumbnailTransition(getTaskId());
+ }
+ }
+
+ public final void onBusEvent(DeleteTaskDataEvent event) {
+ // Remove any stored data from the loader
+ RecentsTaskLoader loader = Recents.getTaskLoader();
+ loader.deleteTaskData(event.task, false);
+
+ // Remove the task from activity manager
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ ssp.removeTask(event.task.key.id);
+ }
+
+ public final void onBusEvent(AllTaskViewsDismissedEvent event) {
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ if (ssp.hasDockedTask()) {
+ mRecentsView.showEmptyView();
+ } else {
+ // Just go straight home (no animation necessary because there are no more task views)
+ dismissRecentsToHome(false /* animateTaskViews */);
+ }
+ }
+
+ public final void onBusEvent(LaunchTaskFailedEvent event) {
+ // Return to Home
+ dismissRecentsToHome(true /* animateTaskViews */);
+ }
+
+ @Override
+ public boolean onPreDraw() {
+ mRecentsView.getViewTreeObserver().removeOnPreDrawListener(this);
+ // We post to make sure that this information is delivered after this traversals is
+ // finished.
+ mRecentsView.post(new Runnable() {
+ @Override
+ public void run() {
+ Recents.getSystemServices().endProlongedAnimations();
+ }
+ });
+ return true;
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java b/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java
new file mode 100644
index 0000000..8028327
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.recents.tv.animations;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ObjectAnimator;
+import android.content.res.Resources;
+import android.util.TypedValue;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.Interpolator;
+
+import com.android.systemui.R;
+
+public class ViewFocusAnimator implements View.OnFocusChangeListener {
+ private final float mUnselectedScale;
+ private final float mSelectedScaleDelta;
+ private final float mUnselectedZ;
+ private final float mSelectedZDelta;
+ private final int mAnimDuration;
+ private final Interpolator mFocusInterpolator;
+
+ protected View mTargetView;
+ private float mFocusProgress;
+
+ ObjectAnimator mFocusAnimation;
+
+ public ViewFocusAnimator(View view) {
+ mTargetView = view;
+ final Resources res = view.getResources();
+
+ mTargetView.setOnFocusChangeListener(this);
+
+ TypedValue out = new TypedValue();
+ res.getValue(R.raw.unselected_scale, out, true);
+ mUnselectedScale = out.getFloat();
+ mSelectedScaleDelta = res.getFraction(R.fraction.lb_focus_zoom_factor_medium, 1, 1) -
+ mUnselectedScale;
+
+ mUnselectedZ = res.getDimensionPixelOffset(R.dimen.recents_tv_unselected_item_z);
+ mSelectedZDelta = res.getDimensionPixelOffset(R.dimen.recents_tv_selected_item_z_delta);
+
+ mAnimDuration = res.getInteger(R.integer.item_scale_anim_duration);
+
+ mFocusInterpolator = new AccelerateDecelerateInterpolator();
+
+ mFocusAnimation = ObjectAnimator.ofFloat(this, "focusProgress", 0.0f);
+ mFocusAnimation.setDuration(mAnimDuration);
+ mFocusAnimation.setInterpolator(mFocusInterpolator);
+
+ setFocusProgress(0.0f);
+
+ mFocusAnimation.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationStart(Animator animation) {
+ mTargetView.setHasTransientState(true);
+ }
+
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ mTargetView.setHasTransientState(false);
+ }
+ });
+ }
+
+ public void setFocusProgress(float level) {
+ mFocusProgress = level;
+
+ float scale = mUnselectedScale + (level * mSelectedScaleDelta);
+ float z = mUnselectedZ + (level * mSelectedZDelta);
+
+ mTargetView.setScaleX(scale);
+ mTargetView.setScaleY(scale);
+ mTargetView.setZ(z);
+ }
+
+ public float getFocusProgress() {
+ return mFocusProgress;
+ }
+
+ public void animateFocus(boolean focused) {
+ if (mFocusAnimation.isStarted()) {
+ mFocusAnimation.cancel();
+ }
+
+ float target = focused ? 1.0f : 0.0f;
+
+ if (getFocusProgress() != target) {
+ mFocusAnimation.setFloatValues(getFocusProgress(), target);
+ mFocusAnimation.start();
+ }
+ }
+
+ public void setFocusImmediate(boolean focused) {
+ if (mFocusAnimation.isStarted()) {
+ mFocusAnimation.cancel();
+ }
+
+ float target = focused ? 1.0f : 0.0f;
+
+ setFocusProgress(target);
+ }
+
+ @Override
+ public void onFocusChange(View v, boolean hasFocus) {
+ if (v != mTargetView) {
+ return;
+ }
+ changeSize(hasFocus);
+ }
+
+ protected void changeSize(boolean hasFocus) {
+ ViewGroup.LayoutParams lp = mTargetView.getLayoutParams();
+ int width = lp.width;
+ int height = lp.height;
+
+ if (width < 0 && height < 0) {
+ mTargetView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
+ height = mTargetView.getMeasuredHeight();
+ }
+
+ if (mTargetView.isAttachedToWindow() && mTargetView.hasWindowFocus() &&
+ mTargetView.getVisibility() == View.VISIBLE) {
+ animateFocus(hasFocus);
+ } else {
+ setFocusImmediate(hasFocus);
+ }
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/views/RecentsTvView.java b/packages/SystemUI/src/com/android/systemui/recents/tv/views/RecentsTvView.java
new file mode 100644
index 0000000..b175855
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/tv/views/RecentsTvView.java
@@ -0,0 +1,242 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.recents.tv.views;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.WindowInsets;
+import android.widget.FrameLayout;
+
+import com.android.systemui.R;
+import com.android.systemui.recents.Recents;
+import com.android.systemui.recents.RecentsActivity;
+import com.android.systemui.recents.RecentsActivityLaunchState;
+import com.android.systemui.recents.RecentsConfiguration;
+import com.android.systemui.recents.events.EventBus;
+import com.android.systemui.recents.events.activity.CancelEnterRecentsWindowAnimationEvent;
+import com.android.systemui.recents.events.activity.DismissRecentsToHomeAnimationStarted;
+import com.android.systemui.recents.events.activity.TaskStackUpdatedEvent;
+import com.android.systemui.recents.events.component.RecentsVisibilityChangedEvent;
+import com.android.systemui.recents.misc.SystemServicesProxy;
+import com.android.systemui.recents.model.Task;
+import com.android.systemui.recents.model.TaskStack;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Top level layout of recents for TV. This will show the TaskStacks using a HorizontalGridView.
+ */
+public class RecentsTvView extends FrameLayout {
+
+ private static final String TAG = "RecentsTvView";
+ private static final boolean DEBUG = false;
+
+ private TaskStack mStack;
+ private TaskStackHorizontalGridView mTaskStackHorizontalView;
+ private View mEmptyView;
+ private boolean mAwaitingFirstLayout = true;
+ private Rect mSystemInsets = new Rect();
+
+
+ public RecentsTvView(Context context) {
+ this(context, null);
+ }
+
+ public RecentsTvView(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public RecentsTvView(Context context, AttributeSet attrs, int defStyleAttr) {
+ this(context, attrs, defStyleAttr, 0);
+ }
+
+ public RecentsTvView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+
+ setWillNotDraw(false);
+
+ LayoutInflater inflater = LayoutInflater.from(context);
+ mEmptyView = inflater.inflate(R.layout.recents_empty, this, false);
+ addView(mEmptyView);
+ }
+
+ public void setTaskStack(TaskStack stack) {
+ RecentsConfiguration config = Recents.getConfiguration();
+ RecentsActivityLaunchState launchState = config.getLaunchState();
+ mStack = stack;
+
+ if (mTaskStackHorizontalView != null) {
+ mTaskStackHorizontalView.reset();
+ mTaskStackHorizontalView.setStack(stack);
+ } else {
+ mTaskStackHorizontalView = (TaskStackHorizontalGridView) findViewById(R.id.task_list);
+ mTaskStackHorizontalView.setStack(stack);
+ }
+
+
+ if (stack.getStackTaskCount() > 0) {
+ hideEmptyView();
+ } else {
+ showEmptyView();
+ }
+
+ requestLayout();
+ }
+
+ public Task getNextTaskOrTopTask(Task taskToSearch) {
+ Task returnTask = null;
+ boolean found = false;
+ if (mTaskStackHorizontalView != null) {
+ TaskStack stack = mTaskStackHorizontalView.getStack();
+ ArrayList<Task> taskList = stack.getStackTasks();
+ // Iterate the stack views and try and find the focused task
+ for (int j = taskList.size() - 1; j >= 0; --j) {
+ Task task = taskList.get(j);
+ // Return the next task in the line.
+ if (found)
+ return task;
+ // Remember the first possible task as the top task.
+ if (returnTask == null)
+ returnTask = task;
+ if (task == taskToSearch)
+ found = true;
+ }
+ }
+ return returnTask;
+ }
+
+ public boolean launchFocusedTask() {
+ if (mTaskStackHorizontalView != null) {
+ Task task = mTaskStackHorizontalView.getFocusedTask();
+ if (task != null) {
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ ssp.startActivityFromRecents(getContext(), task.key.id, task.title, null);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /** Launches the task that recents was launched from if possible */
+ public boolean launchPreviousTask() {
+ if (mTaskStackHorizontalView != null) {
+ TaskStack stack = mTaskStackHorizontalView.getStack();
+ Task task = stack.getLaunchTarget();
+ if (task != null) {
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ ssp.startActivityFromRecents(getContext(), task.key.id, task.title, null);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /** Launches a given task. */
+ public boolean launchTask(Task task, Rect taskBounds, int destinationStack) {
+ if (mTaskStackHorizontalView != null) {
+ // Iterate the stack views and try and find the given task.
+ List<TaskCardView> taskViews = mTaskStackHorizontalView.getTaskViews();
+ int taskViewCount = taskViews.size();
+ for (int j = 0; j < taskViewCount; j++) {
+ TaskCardView tv = taskViews.get(j);
+ if (tv.getTask() == task) {
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ ssp.startActivityFromRecents(getContext(), task.key.id, task.title, null);
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Hides the task stack and shows the empty view.
+ */
+ public void showEmptyView() {
+ mEmptyView.setVisibility(View.VISIBLE);
+ mEmptyView.bringToFront();
+ }
+
+ /**
+ * Shows the task stack and hides the empty view.
+ */
+ public void hideEmptyView() {
+ mEmptyView.setVisibility(View.INVISIBLE);
+ }
+
+ /**
+ * Returns the last known system insets.
+ */
+ public Rect getSystemInsets() {
+ return mSystemInsets;
+ }
+
+ @Override
+ protected void onAttachedToWindow() {
+ EventBus.getDefault().register(this, RecentsActivity.EVENT_BUS_PRIORITY + 1);
+ super.onAttachedToWindow();
+ }
+
+ @Override
+ protected void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ EventBus.getDefault().unregister(this);
+ }
+
+ /**
+ * This is called with the full size of the window since we are handling our own insets.
+ */
+ @Override
+ protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+ if (mTaskStackHorizontalView != null && mTaskStackHorizontalView.getVisibility() != GONE) {
+ mTaskStackHorizontalView.layout(left, top, left + getMeasuredWidth(), top + getMeasuredHeight());
+ }
+
+ // Layout the empty view
+ mEmptyView.layout(left, top, right, bottom);
+ }
+
+ @Override
+ public WindowInsets onApplyWindowInsets(WindowInsets insets) {
+ mSystemInsets.set(insets.getSystemWindowInsets());
+ requestLayout();
+ return insets;
+ }
+
+ /**** EventBus Events ****/
+
+ public final void onBusEvent(DismissRecentsToHomeAnimationStarted event) {
+ // If we are going home, cancel the previous task's window transition
+ EventBus.getDefault().send(new CancelEnterRecentsWindowAnimationEvent(null));
+ }
+
+ public final void onBusEvent(RecentsVisibilityChangedEvent event) {
+ if (!event.visible) {
+ // Reset the view state
+ mAwaitingFirstLayout = true;
+ }
+ }
+
+ public void setTaskStackViewAdapter(TaskStackHorizontalViewAdapter taskStackViewAdapter) {
+ if(mTaskStackHorizontalView != null) {
+ mTaskStackHorizontalView.setAdapter(taskStackViewAdapter);
+ }
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java
new file mode 100644
index 0000000..e275f22
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.recents.tv.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.android.systemui.R;
+import com.android.systemui.recents.model.Task;
+import com.android.systemui.recents.tv.animations.ViewFocusAnimator;
+
+public class TaskCardView extends RelativeLayout {
+
+ private ImageView mThumbnailView;
+ private TextView mTitleTextView;
+ private TextView mContentTextView;
+ private ImageView mBadgeView;
+ private Task mTask;
+
+ private ViewFocusAnimator mViewFocusAnimator;
+
+ public TaskCardView(Context context) {
+ this(context, null);
+ }
+
+ public TaskCardView(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public TaskCardView(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ mViewFocusAnimator = new ViewFocusAnimator(this);
+ }
+
+ @Override
+ protected void onFinishInflate() {
+ mThumbnailView = (ImageView) findViewById(R.id.card_view_thumbnail);
+ mTitleTextView = (TextView) findViewById(R.id.card_title_text);
+ mContentTextView = (TextView) findViewById(R.id.card_content_text);
+ mBadgeView = (ImageView) findViewById(R.id.card_extra_badge);
+ }
+
+ public void init(Task task) {
+ mTask = task;
+ mThumbnailView.setImageBitmap(task.thumbnail);
+ mTitleTextView.setText(task.title);
+ mContentTextView.setText(task.contentDescription);
+ mBadgeView.setImageDrawable(task.icon);
+ }
+
+ public Task getTask() {
+ return mTask;
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalGridView.java b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalGridView.java
new file mode 100644
index 0000000..2d41742
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalGridView.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.recents.tv.views;
+
+
+import android.content.Context;
+import android.support.v17.leanback.widget.HorizontalGridView;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.android.systemui.R;
+import com.android.systemui.recents.RecentsActivity;
+import com.android.systemui.recents.events.EventBus;
+import com.android.systemui.recents.events.ui.AllTaskViewsDismissedEvent;
+import com.android.systemui.recents.model.Task;
+import com.android.systemui.recents.model.TaskStack;
+import com.android.systemui.recents.model.TaskStack.TaskStackCallbacks;
+import com.android.systemui.recents.views.TaskViewAnimation;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Horizontal Grid View Implementation to show the Task Stack for TV.
+ */
+public class TaskStackHorizontalGridView extends HorizontalGridView implements TaskStackCallbacks{
+
+ private TaskStack mStack;
+ private ArrayList<TaskCardView> mTaskViews = new ArrayList<>();
+ private Task mFocusedTask;
+
+
+ public TaskStackHorizontalGridView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ @Override
+ protected void onAttachedToWindow() {
+ EventBus.getDefault().register(this, RecentsActivity.EVENT_BUS_PRIORITY + 1);
+ setItemMargin((int) getResources().getDimension(R.dimen.recents_tv_gird_card_spacing));
+ setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
+ super.onAttachedToWindow();
+ }
+
+ @Override
+ protected void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ EventBus.getDefault().unregister(this);
+ }
+ /**
+ * Resets this view for reuse.
+ */
+ public void reset() {
+ // Reset the focused task
+ resetFocusedTask(getFocusedTask());
+ requestLayout();
+ }
+
+ /**
+ * @param task - Task to reset
+ */
+ private void resetFocusedTask(Task task) {
+ if (task != null) {
+ TaskCardView tv = getChildViewForTask(task);
+ if (tv != null) {
+ tv.requestFocus();
+ }
+ }
+ mFocusedTask = null;
+ }
+
+ /**
+ * Sets the task stack.
+ * @param stack
+ */
+ public void setStack(TaskStack stack) {
+ //Set new stack
+ mStack = stack;
+ if (mStack != null) {
+ mStack.setCallbacks(this);
+ }
+ //Layout with new stack
+ requestLayout();
+ }
+
+ /**
+ * @return Returns the task stack.
+ */
+ public TaskStack getStack() {
+ return mStack;
+ }
+
+ /**
+ * @return - The focused task.
+ */
+ public Task getFocusedTask() {
+ return mFocusedTask;
+ }
+
+ /**
+ * @param task
+ * @return Child view for given task
+ */
+ public TaskCardView getChildViewForTask(Task task) {
+ List<TaskCardView> taskViews = getTaskViews();
+ int taskViewCount = taskViews.size();
+ for (int i = 0; i < taskViewCount; i++) {
+ TaskCardView tv = taskViews.get(i);
+ if (tv.getTask() == task) {
+ return tv;
+ }
+ }
+ return null;
+ }
+
+ public List<TaskCardView> getTaskViews() {
+ return mTaskViews;
+ }
+
+ @Override
+ public void onStackTaskAdded(TaskStack stack, Task newTask){
+ getAdapter().notifyItemInserted(stack.getStackTasks().indexOf(newTask));
+ }
+
+ @Override
+ public void onStackTaskRemoved(TaskStack stack, Task removedTask, boolean wasFrontMostTask,
+ Task newFrontMostTask, TaskViewAnimation animation) {
+ getAdapter().notifyItemRemoved(stack.getStackTasks().indexOf(removedTask));
+ if (mFocusedTask == removedTask) {
+ resetFocusedTask(removedTask);
+ }
+ // If there are no remaining tasks, then just close recents
+ if (mStack.getStackTaskCount() == 0) {
+ boolean shouldFinishActivity = (mStack.getStackTaskCount() == 0);
+ if (shouldFinishActivity) {
+ EventBus.getDefault().send(new AllTaskViewsDismissedEvent());
+ }
+ }
+ }
+
+ @Override
+ public void onHistoryTaskRemoved(TaskStack stack, Task removedTask, TaskViewAnimation animation) {
+ //No history task on tv
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalViewAdapter.java b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalViewAdapter.java
new file mode 100644
index 0000000..7b62f4e
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalViewAdapter.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.recents.tv.views;
+
+import android.app.Activity;
+import android.app.ActivityManagerNative;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.systemui.R;
+import com.android.systemui.recents.model.Task;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TaskStackHorizontalViewAdapter extends
+ RecyclerView.Adapter<TaskStackHorizontalViewAdapter.ViewHolder> {
+
+ private static final String TAG = "TaskStackHorizontalViewAdapter";
+ private List<Task> mTaskList;
+
+ static class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener{
+ private TaskCardView mTaskCardView;
+ private Task mTask;
+ public ViewHolder(View v) {
+ super(v);
+ if(v instanceof TaskCardView) {
+ mTaskCardView = (TaskCardView) v;
+ }
+ }
+
+ public void init(Task task) {
+ mTaskCardView.init(task);
+ mTask = task;
+ mTaskCardView.setOnClickListener(this);
+ }
+
+ @Override
+ public void onClick(View v) {
+ try {
+ ActivityManagerNative.getDefault().startActivityFromRecents(mTask.key.id, null);
+ ((Activity)(v.getContext())).finish();
+ } catch (Exception e) {
+ Log.e(TAG, v.getContext()
+ .getString(R.string.recents_launch_error_message, mTask.title), e);
+ }
+
+ }
+ }
+
+ public TaskStackHorizontalViewAdapter(List tasks) {
+ mTaskList = new ArrayList<>(tasks);
+ }
+
+ public void setNewStackTasks(List tasks) {
+ mTaskList.clear();
+ mTaskList.addAll(tasks);
+ notifyDataSetChanged();
+ }
+ @Override
+ public TaskStackHorizontalViewAdapter.ViewHolder onCreateViewHolder(ViewGroup parent,
+ int viewType) {
+ View view = LayoutInflater.from(parent.getContext())
+ .inflate(R.layout.recents_task_card_view, parent, false);
+ ViewHolder viewHolder = new ViewHolder(view);
+ return viewHolder;
+ }
+
+ @Override
+ public void onBindViewHolder(ViewHolder holder, int position) {
+ holder.init(mTaskList.get(position));
+ }
+
+ @Override
+ public int getItemCount() {
+ return mTaskList.size();
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/FakeShadowDrawable.java b/packages/SystemUI/src/com/android/systemui/recents/views/FakeShadowDrawable.java
index 682fd8f..d64a676 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/FakeShadowDrawable.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/FakeShadowDrawable.java
@@ -28,6 +28,7 @@
import android.graphics.Shader;
import android.graphics.drawable.Drawable;
import android.util.Log;
+
import com.android.systemui.R;
import com.android.systemui.recents.RecentsConfiguration;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/FixedSizeImageView.java b/packages/SystemUI/src/com/android/systemui/recents/views/FixedSizeImageView.java
index f5ab01f..d3b5e47 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/FixedSizeImageView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/FixedSizeImageView.java
@@ -20,13 +20,14 @@
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
-import android.widget.ImageView;
+
+import com.android.systemui.statusbar.AlphaOptimizedImageView;
/**
* This is an optimized ImageView that does not trigger a <code>requestLayout()</code> or
* <code>invalidate()</code> when setting the image to <code>null</code>.
*/
-public class FixedSizeImageView extends ImageView {
+public class FixedSizeImageView extends AlphaOptimizedImageView {
private boolean mAllowRelayout = true;
private boolean mAllowInvalidate = true;
@@ -73,9 +74,4 @@
mAllowRelayout = true;
mAllowInvalidate = true;
}
-
- @Override
- public boolean hasOverlappingRendering() {
- return false;
- }
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/FreeformWorkspaceLayoutAlgorithm.java b/packages/SystemUI/src/com/android/systemui/recents/views/FreeformWorkspaceLayoutAlgorithm.java
index 491c4c2..511aa3c 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/FreeformWorkspaceLayoutAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/FreeformWorkspaceLayoutAlgorithm.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.graphics.RectF;
import android.util.ArrayMap;
+
import com.android.systemui.R;
import com.android.systemui.recents.model.Task;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java
index b363ed5..3fdd771 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java
@@ -31,6 +31,7 @@
import android.view.AppTransitionAnimationSpec;
import android.view.IAppTransitionAnimationSpecsFuture;
import android.view.WindowManagerGlobal;
+
import com.android.internal.annotations.GuardedBy;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsDebugFlags;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
index b59ff30..e2ff52c 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
@@ -35,13 +35,12 @@
import android.view.ViewOutlineProvider;
import android.view.ViewPropertyAnimator;
import android.view.WindowInsets;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
import android.widget.FrameLayout;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsActivity;
@@ -76,7 +75,6 @@
import com.android.systemui.recents.model.TaskStack;
import com.android.systemui.stackdivider.WindowManagerProxy;
import com.android.systemui.statusbar.FlingAnimationUtils;
-import com.android.systemui.statusbar.phone.PhoneStatusBar;
import java.util.ArrayList;
import java.util.List;
@@ -113,9 +111,6 @@
private RecentsTransitionHelper mTransitionHelper;
private RecentsViewTouchHandler mTouchHandler;
-
- private final Interpolator mFastOutSlowInInterpolator;
- private final Interpolator mFastOutLinearInInterpolator;
private final FlingAnimationUtils mFlingAnimationUtils;
public RecentsView(Context context) {
@@ -137,10 +132,6 @@
SystemServicesProxy ssp = Recents.getSystemServices();
mHandler = new Handler();
mTransitionHelper = new RecentsTransitionHelper(getContext(), mHandler);
- mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
- com.android.internal.R.interpolator.fast_out_slow_in);
- mFastOutLinearInInterpolator = AnimationUtils.loadInterpolator(context,
- com.android.internal.R.interpolator.fast_out_linear_in);
mDividerSize = ssp.getDockedDividerSize(context);
mTouchHandler = new RecentsViewTouchHandler(this);
mFlingAnimationUtils = new FlingAnimationUtils(context, 0.3f);
@@ -597,7 +588,7 @@
tmpTransform.scale = 1f;
tmpTransform.rect.set(taskViewRect);
mTaskStackView.updateTaskViewToTransform(event.taskView, tmpTransform,
- new TaskViewAnimation(125, PhoneStatusBar.ALPHA_OUT,
+ new TaskViewAnimation(125, Interpolators.ALPHA_OUT,
new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
@@ -609,7 +600,7 @@
// Animate the stack accordingly
TaskViewAnimation stackAnim = new TaskViewAnimation(
TaskStackView.DEFAULT_SYNC_STACK_DURATION,
- mFastOutSlowInInterpolator);
+ Interpolators.FAST_OUT_SLOW_IN);
mTaskStackView.getStack().removeTask(event.task, stackAnim);
}
}));
@@ -731,7 +722,7 @@
.alpha(0f)
.translationY(stackRect.height() / 2)
.setDuration(historyTransitionDuration)
- .setInterpolator(mFastOutSlowInInterpolator)
+ .setInterpolator(Interpolators.FAST_OUT_SLOW_IN)
.withEndAction(new Runnable() {
@Override
public void run() {
@@ -756,7 +747,7 @@
.alpha(1f)
.translationY(0)
.setDuration(historyTransitionDuration)
- .setInterpolator(mFastOutSlowInInterpolator)
+ .setInterpolator(Interpolators.FAST_OUT_SLOW_IN)
.start();
}
@@ -794,7 +785,7 @@
mHistoryButton.animate()
.alpha(1f)
.setDuration(duration)
- .setInterpolator(mFastOutSlowInInterpolator)
+ .setInterpolator(Interpolators.FAST_OUT_SLOW_IN)
.withLayer()
.start();
}
@@ -825,7 +816,7 @@
mHistoryButton.animate()
.alpha(0f)
.setDuration(duration)
- .setInterpolator(mFastOutSlowInInterpolator)
+ .setInterpolator(Interpolators.FAST_OUT_SLOW_IN)
.withEndAction(new Runnable() {
@Override
public void run() {
@@ -854,7 +845,7 @@
if (newDockStates == null || !newDockStatesSet.contains(dockState)) {
// This is no longer visible, so hide it
viewState.startAnimation(null, 0, DOCK_AREA_OVERLAY_TRANSITION_DURATION,
- PhoneStatusBar.ALPHA_OUT, animateAlpha, animateBounds);
+ Interpolators.ALPHA_OUT, animateAlpha, animateBounds);
} else {
// This state is now visible, update the bounds and show it
int alpha = (overrideAlpha != -1 ? overrideAlpha : viewState.dockAreaAlpha);
@@ -867,7 +858,7 @@
viewState.dockAreaOverlay.setBounds(bounds);
}
viewState.startAnimation(bounds, alpha, DOCK_AREA_OVERLAY_TRANSITION_DURATION,
- PhoneStatusBar.ALPHA_IN, animateAlpha, animateBounds);
+ Interpolators.ALPHA_IN, animateAlpha, animateBounds);
}
}
}
@@ -882,8 +873,8 @@
mBackgroundScrim.getAlpha(), alphaInt);
mBackgroundScrimAnimator.setDuration(duration);
mBackgroundScrimAnimator.setInterpolator(alphaInt > mBackgroundScrim.getAlpha()
- ? PhoneStatusBar.ALPHA_OUT
- : PhoneStatusBar.ALPHA_IN);
+ ? Interpolators.ALPHA_OUT
+ : Interpolators.ALPHA_IN);
mBackgroundScrimAnimator.start();
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
index d8698ee..346ce16 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
@@ -20,6 +20,7 @@
import android.graphics.Point;
import android.view.MotionEvent;
import android.view.ViewConfiguration;
+
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsConfiguration;
import com.android.systemui.recents.events.EventBus;
@@ -149,7 +150,8 @@
}
// Request other drop targets to register themselves
- EventBus.getDefault().send(new DragStartInitializeDropTargetsEvent(event.task, this));
+ EventBus.getDefault().send(new DragStartInitializeDropTargetsEvent(event.task,
+ event.taskView, this));
}
public final void onBusEvent(DragEndEvent event) {
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/SystemBarScrimViews.java b/packages/SystemUI/src/com/android/systemui/recents/views/SystemBarScrimViews.java
index 2254dfc..e8fa398 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/SystemBarScrimViews.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/SystemBarScrimViews.java
@@ -19,8 +19,8 @@
import android.app.Activity;
import android.content.Context;
import android.view.View;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
+
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.recents.events.activity.DismissRecentsToHomeAnimationStarted;
import com.android.systemui.recents.events.activity.EnterRecentsWindowAnimationCompletedEvent;
@@ -37,18 +37,11 @@
int mNavBarScrimEnterDuration;
- Interpolator mFastOutSlowInInterpolator;
- Interpolator mQuintOutInterpolator;
-
public SystemBarScrimViews(Activity activity) {
mContext = activity;
mNavBarScrimView = activity.findViewById(R.id.nav_bar_scrim);
mNavBarScrimEnterDuration = activity.getResources().getInteger(
R.integer.recents_nav_bar_scrim_enter_duration);
- mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(activity,
- com.android.internal.R.interpolator.fast_out_slow_in);
- mQuintOutInterpolator = AnimationUtils.loadInterpolator(activity,
- com.android.internal.R.interpolator.decelerate_quint);
}
/**
@@ -74,7 +67,7 @@
mNavBarScrimView.animate()
.translationY(0)
.setDuration(mNavBarScrimEnterDuration)
- .setInterpolator(mQuintOutInterpolator)
+ .setInterpolator(Interpolators.DECELERATE_QUINT)
.withStartAction(new Runnable() {
@Override
public void run() {
@@ -97,7 +90,7 @@
.translationY(mNavBarScrimView.getMeasuredHeight())
.setStartDelay(0)
.setDuration(taskViewExitToAppDuration)
- .setInterpolator(mFastOutSlowInInterpolator)
+ .setInterpolator(Interpolators.FAST_OUT_SLOW_IN)
.start();
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java
index d550d83..682c298 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java
@@ -22,8 +22,8 @@
import android.content.res.Resources;
import android.graphics.RectF;
import android.view.View;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
+
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsActivityLaunchState;
@@ -31,7 +31,6 @@
import com.android.systemui.recents.misc.ReferenceCountedTrigger;
import com.android.systemui.recents.model.Task;
import com.android.systemui.recents.model.TaskStack;
-import com.android.systemui.statusbar.phone.PhoneStatusBar;
import java.util.List;
@@ -66,20 +65,10 @@
private TaskStackView mStackView;
- private Interpolator mFastOutSlowInInterpolator;
- private Interpolator mFastOutLinearInInterpolator;
- private Interpolator mQuintOutInterpolator;
-
private TaskViewTransform mTmpTransform = new TaskViewTransform();
public TaskStackAnimationHelper(Context context, TaskStackView stackView) {
mStackView = stackView;
- mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
- com.android.internal.R.interpolator.fast_out_slow_in);
- mFastOutLinearInInterpolator = AnimationUtils.loadInterpolator(context,
- com.android.internal.R.interpolator.fast_out_linear_in);
- mQuintOutInterpolator = AnimationUtils.loadInterpolator(context,
- com.android.internal.R.interpolator.decelerate_quint);
}
/**
@@ -198,7 +187,7 @@
// Animate the task up if it was occluding the launch target
if (currentTaskOccludesLaunchTarget) {
TaskViewAnimation taskAnimation = new TaskViewAnimation(
- taskViewEnterFromAffiliatedAppDuration, PhoneStatusBar.ALPHA_IN,
+ taskViewEnterFromAffiliatedAppDuration, Interpolators.ALPHA_IN,
new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
@@ -219,7 +208,7 @@
frontIndex * taskViewEnterFromHomeStaggerDelay;
TaskViewAnimation taskAnimation = new TaskViewAnimation(delay,
- duration, mQuintOutInterpolator,
+ duration, Interpolators.DECELERATE_QUINT,
postAnimationTrigger.decrementOnAnimationEnd());
postAnimationTrigger.increment();
mStackView.updateTaskViewToTransform(tv, mTmpTransform, taskAnimation);
@@ -253,7 +242,7 @@
TaskView tv = taskViews.get(i);
Task task = tv.getTask();
TaskViewAnimation taskAnimation = new TaskViewAnimation(
- animated ? taskViewExitToHomeDuration : 0, mFastOutLinearInInterpolator,
+ animated ? taskViewExitToHomeDuration : 0, Interpolators.FAST_OUT_LINEAR_IN,
postAnimationTrigger.decrementOnAnimationEnd());
postAnimationTrigger.increment();
@@ -295,7 +284,7 @@
} else if (currentTaskOccludesLaunchTarget) {
// Animate this task out of view
TaskViewAnimation taskAnimation = new TaskViewAnimation(
- taskViewExitToAppDuration, PhoneStatusBar.ALPHA_OUT,
+ taskViewExitToAppDuration, Interpolators.ALPHA_OUT,
postAnimationTrigger.decrementOnAnimationEnd());
postAnimationTrigger.increment();
@@ -327,7 +316,7 @@
// Compose the new animation and transform and star the animation
TaskViewAnimation taskAnimation = new TaskViewAnimation(taskViewRemoveAnimDuration,
- PhoneStatusBar.ALPHA_OUT, new AnimatorListenerAdapter() {
+ Interpolators.ALPHA_OUT, new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
postAnimationTrigger.decrement();
@@ -364,7 +353,7 @@
TaskView tv = taskViews.get(i);
Task task = tv.getTask();
TaskViewAnimation taskAnimation = new TaskViewAnimation(startDelayIncr * i,
- historyTransitionDuration, mFastOutSlowInInterpolator,
+ historyTransitionDuration, Interpolators.FAST_OUT_SLOW_IN,
postAnimationTrigger.decrementOnAnimationEnd());
postAnimationTrigger.increment();
@@ -393,7 +382,7 @@
for (int i = taskViewCount - 1; i >= 0; i--) {
TaskView tv = taskViews.get(i);
TaskViewAnimation taskAnimation = new TaskViewAnimation(startDelayIncr * i,
- historyTransitionDuration, mFastOutSlowInInterpolator);
+ historyTransitionDuration, Interpolators.FAST_OUT_SLOW_IN);
stackLayout.getStackTransform(tv.getTask(), stackScroller.getStackScroll(),
mTmpTransform, null);
mTmpTransform.alpha = 1f;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java
index bb37c04..7c695ce 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java
@@ -25,8 +25,8 @@
import android.util.ArraySet;
import android.util.FloatProperty;
import android.util.Property;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
+
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsActivityLaunchState;
@@ -212,7 +212,6 @@
}
Context mContext;
- private Interpolator mLinearOutSlowInInterpolator;
private StackState mState = StackState.SPLIT;
private TaskStackLayoutAlgorithmCallbacks mCb;
@@ -299,8 +298,6 @@
mMinTranslationZ = res.getDimensionPixelSize(R.dimen.recents_task_view_z_min);
mMaxTranslationZ = res.getDimensionPixelSize(R.dimen.recents_task_view_z_max);
mFreeformLayoutAlgorithm = new FreeformWorkspaceLayoutAlgorithm(context);
- mLinearOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
- com.android.internal.R.interpolator.linear_out_slow_in);
}
/**
@@ -489,7 +486,7 @@
newState);
mFocusStateAnimator.setDuration(mContext.getResources().getInteger(
R.integer.recents_animate_task_stack_scroll_duration));
- mFocusStateAnimator.setInterpolator(mLinearOutSlowInInterpolator);
+ mFocusStateAnimator.setInterpolator(Interpolators.LINEAR_OUT_SLOW_IN);
mFocusStateAnimator.start();
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
index 79f6381..232b416 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
@@ -36,9 +36,10 @@
import android.view.View;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo;
-import android.view.animation.AnimationUtils;
import android.view.animation.Interpolator;
import android.widget.FrameLayout;
+
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsActivity;
@@ -58,6 +59,7 @@
import com.android.systemui.recents.events.activity.PackagesChangedEvent;
import com.android.systemui.recents.events.activity.ShowHistoryButtonEvent;
import com.android.systemui.recents.events.activity.ShowHistoryEvent;
+import com.android.systemui.recents.events.activity.TaskStackUpdatedEvent;
import com.android.systemui.recents.events.component.RecentsVisibilityChangedEvent;
import com.android.systemui.recents.events.ui.AllTaskViewsDismissedEvent;
import com.android.systemui.recents.events.ui.DeleteTaskDataEvent;
@@ -141,6 +143,7 @@
Rect mStableStackBounds = new Rect();
// The current stack bounds are dynamic and may change as the user drags and drops
Rect mStackBounds = new Rect();
+
int[] mTmpVisibleRange = new int[2];
Rect mTmpRect = new Rect();
ArrayMap<Task.TaskKey, TaskView> mTmpTaskViewMap = new ArrayMap<>();
@@ -148,8 +151,6 @@
TaskViewTransform mTmpTransform = new TaskViewTransform();
LayoutInflater mInflater;
- Interpolator mFastOutSlowInInterpolator;
-
// A convenience update listener to request updating clipping of tasks
private ValueAnimator.AnimatorUpdateListener mRequestUpdateClippingListener =
new ValueAnimator.AnimatorUpdateListener() {
@@ -200,8 +201,6 @@
mStackScroller = new TaskStackViewScroller(context, this, mLayoutAlgorithm);
mTouchHandler = new TaskStackViewTouchHandler(context, this, mStackScroller);
mAnimationHelper = new TaskStackAnimationHelper(context, this);
- mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
- com.android.internal.R.interpolator.fast_out_slow_in);
mTaskCornerRadiusPx = res.getDimensionPixelSize(
R.dimen.recents_task_view_rounded_corners_radius);
mDividerSize = ssp.getDockedDividerSize(context);
@@ -234,8 +233,8 @@
@Override
protected void onAttachedToWindow() {
EventBus.getDefault().register(this, RecentsActivity.EVENT_BUS_PRIORITY + 1);
- readSystemFlags();
super.onAttachedToWindow();
+ readSystemFlags();
}
@Override
@@ -863,8 +862,7 @@
// TODO: Center the newly focused task view, only if not freeform
float newScroll = mLayoutAlgorithm.getStackScrollForTask(newFocusedTask);
if (Float.compare(newScroll, mStackScroller.getStackScroll()) != 0) {
- mStackScroller.animateScroll(mStackScroller.getStackScroll(), newScroll,
- focusTaskRunnable);
+ mStackScroller.animateScroll(newScroll, focusTaskRunnable);
willScroll = true;
} else {
focusTaskRunnable.run();
@@ -1227,7 +1225,7 @@
// Animate in the freeform workspace
animateFreeformWorkspaceBackgroundAlpha(
mLayoutAlgorithm.getStackState().freeformBackgroundAlpha, 150,
- mFastOutSlowInInterpolator);
+ Interpolators.FAST_OUT_SLOW_IN);
// Set the task focused state without requesting view focus, and leave the focus animations
// until after the enter-animation
@@ -1321,7 +1319,7 @@
// Animate all the tasks into place
relayoutTaskViews(new TaskViewAnimation(DEFAULT_SYNC_STACK_DURATION,
- mFastOutSlowInInterpolator));
+ Interpolators.FAST_OUT_SLOW_IN));
}
/**
@@ -1420,7 +1418,9 @@
Recents.getTaskLoader().loadTaskData(task, true /* fetchAndInvalidateThumbnails */);
// If the doze trigger has already fired, then update the state for this task view
- tv.setNoUserInteractionState();
+ if (mUIDozeTrigger.hasTriggered()) {
+ tv.setNoUserInteractionState();
+ }
// Set the new state for this view, including the callbacks and view clipping
tv.setCallbacks(this);
@@ -1534,7 +1534,7 @@
int taskViewExitToHomeDuration = getResources().getInteger(
R.integer.recents_task_exit_to_home_duration);
animateFreeformWorkspaceBackgroundAlpha(0, taskViewExitToHomeDuration,
- mFastOutSlowInInterpolator);
+ Interpolators.FAST_OUT_SLOW_IN);
}
public final void onBusEvent(DismissFocusedTaskViewEvent event) {
@@ -1589,8 +1589,7 @@
public final void onBusEvent(DragStartEvent event) {
if (event.task.isFreeformTask()) {
// Animate to the front of the stack
- mStackScroller.animateScroll(mStackScroller.getStackScroll(),
- mLayoutAlgorithm.mInitialScrollP, null);
+ mStackScroller.animateScroll(mLayoutAlgorithm.mInitialScrollP, null);
}
// Enlarge the dragged view slightly
@@ -1600,7 +1599,7 @@
mTmpTransform.scale = finalScale;
mTmpTransform.translationZ = mLayoutAlgorithm.mMaxTranslationZ + 1;
updateTaskViewToTransform(event.taskView, mTmpTransform,
- new TaskViewAnimation(DRAG_SCALE_DURATION, mFastOutSlowInInterpolator));
+ new TaskViewAnimation(DRAG_SCALE_DURATION, Interpolators.FAST_OUT_SLOW_IN));
}
public final void onBusEvent(DragStartInitializeDropTargetsEvent event) {
@@ -1612,11 +1611,10 @@
}
public final void onBusEvent(DragDropTargetChangedEvent event) {
- TaskViewAnimation animation = new TaskViewAnimation(250, mFastOutSlowInInterpolator);
+ TaskViewAnimation animation = new TaskViewAnimation(250, Interpolators.FAST_OUT_SLOW_IN);
if (event.dropTarget instanceof TaskStack.DockState) {
// Calculate the new task stack bounds that matches the window size that Recents will
// have after the drop
- addIgnoreTask(event.task);
final TaskStack.DockState dockState = (TaskStack.DockState) event.dropTarget;
mStackBounds.set(dockState.getDockedTaskStackBounds(getMeasuredWidth(),
getMeasuredHeight(), mDividerSize, mLayoutAlgorithm.mSystemInsets,
@@ -1686,9 +1684,9 @@
mTmpTransform, null);
event.getAnimationTrigger().increment();
relayoutTaskViews(new TaskViewAnimation(DEFAULT_SYNC_STACK_DURATION,
- mFastOutSlowInInterpolator));
+ Interpolators.FAST_OUT_SLOW_IN));
updateTaskViewToTransform(event.taskView, mTmpTransform,
- new TaskViewAnimation(DEFAULT_SYNC_STACK_DURATION, mFastOutSlowInInterpolator,
+ new TaskViewAnimation(DEFAULT_SYNC_STACK_DURATION, Interpolators.FAST_OUT_SLOW_IN,
event.getAnimationTrigger().decrementOnAnimationEnd()));
removeIgnoreTask(event.task);
}
@@ -1778,6 +1776,17 @@
mAnimationHelper.startHideHistoryAnimation();
}
+ public final void onBusEvent(TaskStackUpdatedEvent event) {
+ // Scroll the stack to the front after it has been updated
+ event.addPostAnimationCallback(new Runnable() {
+ @Override
+ public void run() {
+ mStackScroller.animateScroll(mLayoutAlgorithm.mMaxScrollP,
+ null /* postScrollRunnable */);
+ }
+ });
+ }
+
/**
* Removes the task from the stack, and updates the focus to the next task in the stack if the
* removed TaskView was focused.
@@ -1789,7 +1798,7 @@
// Remove the task from the stack
mStack.removeTask(task, new TaskViewAnimation(DEFAULT_SYNC_STACK_DURATION,
- mFastOutSlowInInterpolator));
+ Interpolators.FAST_OUT_SLOW_IN));
}
/**
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewScroller.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewScroller.java
index 4ec051f..ced5d4b 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewScroller.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewScroller.java
@@ -23,10 +23,12 @@
import android.util.FloatProperty;
import android.util.Log;
import android.util.Property;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
import android.widget.OverScroller;
+
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
+import com.android.systemui.recents.Recents;
+import com.android.systemui.recents.misc.SystemServicesProxy;
import com.android.systemui.recents.misc.Utilities;
/* The scrolling logic for a TaskStackView */
@@ -69,16 +71,12 @@
ObjectAnimator mScrollAnimator;
float mFinalAnimatedScroll;
- private Interpolator mLinearOutSlowInInterpolator;
-
public TaskStackViewScroller(Context context, TaskStackViewScrollerCallbacks cb,
TaskStackLayoutAlgorithm layoutAlgorithm) {
mContext = context;
mCb = cb;
mScroller = new OverScroller(context);
mLayoutAlgorithm = layoutAlgorithm;
- mLinearOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
- com.android.internal.R.interpolator.linear_out_slow_in);
}
/** Resets the task scroller. */
@@ -115,8 +113,13 @@
* @return whether the stack progress changed.
*/
public boolean setStackScrollToInitialState() {
+ SystemServicesProxy ssp = Recents.getSystemServices();
float prevStackScrollP = mStackScrollP;
- setStackScroll(getBoundedStackScroll(mLayoutAlgorithm.mInitialScrollP));
+ if (ssp.hasDockedTask()) {
+ setStackScroll(mLayoutAlgorithm.mMaxScrollP);
+ } else {
+ setStackScroll(mLayoutAlgorithm.mInitialScrollP);
+ }
return Float.compare(prevStackScrollP, mStackScrollP) != 0;
}
@@ -173,13 +176,13 @@
float newScroll = getBoundedStackScroll(curScroll);
if (Float.compare(newScroll, curScroll) != 0) {
// Start a new scroll animation
- animateScroll(curScroll, newScroll, null);
+ animateScroll(newScroll, null /* postScrollRunnable */);
}
return mScrollAnimator;
}
/** Animates the stack scroll */
- void animateScroll(float curScroll, float newScroll, final Runnable postRunnable) {
+ void animateScroll(float newScroll, final Runnable postRunnable) {
// Finish any current scrolling animations
if (mScrollAnimator != null && mScrollAnimator.isRunning()) {
setStackScroll(mFinalAnimatedScroll);
@@ -189,10 +192,10 @@
stopBoundScrollAnimation();
mFinalAnimatedScroll = newScroll;
- mScrollAnimator = ObjectAnimator.ofFloat(this, STACK_SCROLL, curScroll, newScroll);
+ mScrollAnimator = ObjectAnimator.ofFloat(this, STACK_SCROLL, getStackScroll(), newScroll);
mScrollAnimator.setDuration(mContext.getResources().getInteger(
R.integer.recents_animate_task_stack_scroll_duration));
- mScrollAnimator.setInterpolator(mLinearOutSlowInInterpolator);
+ mScrollAnimator.setInterpolator(Interpolators.LINEAR_OUT_SLOW_IN);
mScrollAnimator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java
index 7019444..da99956 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java
@@ -31,7 +31,9 @@
import android.view.ViewParent;
import android.view.animation.Interpolator;
import android.view.animation.PathInterpolator;
+
import com.android.internal.logging.MetricsLogger;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.SwipeHelper;
import com.android.systemui.recents.Constants;
@@ -121,7 +123,7 @@
@Override
protected void prepareSnapBackAnimation(View v, Animator anim) {
- anim.setInterpolator(mSv.mFastOutSlowInInterpolator);
+ anim.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
mSwipeHelperAnimations.put(v, anim);
}
};
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
index 5a4064a..853f868 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
@@ -29,6 +29,7 @@
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.Rect;
+import android.provider.Settings;
import android.util.AttributeSet;
import android.util.FloatProperty;
import android.util.IntProperty;
@@ -37,8 +38,8 @@
import android.view.View;
import android.view.ViewOutlineProvider;
import android.view.animation.AccelerateInterpolator;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
+
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsActivity;
@@ -54,7 +55,6 @@
import com.android.systemui.recents.misc.Utilities;
import com.android.systemui.recents.model.Task;
import com.android.systemui.recents.model.TaskStack;
-import com.android.systemui.statusbar.phone.PhoneStatusBar;
import java.util.ArrayList;
@@ -115,6 +115,7 @@
Task mTask;
boolean mTaskDataLoaded;
boolean mClipViewInStack = true;
+ boolean mTouchExplorationEnabled;
AnimateableViewBounds mViewBounds;
private AnimatorSet mTransformAnimation;
@@ -128,8 +129,6 @@
Point mDownTouchPos = new Point();
- Interpolator mFastOutSlowInInterpolator;
-
public TaskView(Context context) {
this(context, null);
}
@@ -149,8 +148,6 @@
mMaxDimScale = res.getInteger(R.integer.recents_max_task_stack_view_dim) / 255f;
mViewBounds = new AnimateableViewBounds(this, res.getDimensionPixelSize(
R.dimen.recents_task_view_rounded_corners_radius));
- mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
- com.android.internal.R.interpolator.fast_out_slow_in);
if (config.fakeShadows) {
setBackground(new FakeShadowDrawable(res, config));
}
@@ -167,6 +164,7 @@
void reset() {
resetViewProperties();
resetNoUserInteractionState();
+ readSystemFlags();
setClipViewInStack(false);
setCallbacks(null);
}
@@ -182,6 +180,12 @@
}
@Override
+ protected void onAttachedToWindow() {
+ super.onAttachedToWindow();
+ readSystemFlags();
+ }
+
+ @Override
protected void onFinishInflate() {
// Bind the views
mContent = findViewById(R.id.task_view_content);
@@ -456,7 +460,7 @@
.scaleX(1f)
.scaleY(1f)
.setDuration(fadeInDuration)
- .setInterpolator(PhoneStatusBar.ALPHA_IN)
+ .setInterpolator(Interpolators.ALPHA_IN)
.start();
} else {
mActionButtonView.setScaleX(1f);
@@ -483,7 +487,7 @@
mActionButtonView.animate()
.alpha(0f)
.setDuration(fadeOutDuration)
- .setInterpolator(PhoneStatusBar.ALPHA_OUT)
+ .setInterpolator(Interpolators.ALPHA_OUT)
.withEndAction(new Runnable() {
@Override
public void run() {
@@ -529,7 +533,7 @@
if (mDimAlpha > 0) {
ObjectAnimator anim = ObjectAnimator.ofInt(this, DIM, getDim(), 0);
anim.setDuration(duration);
- anim.setInterpolator(PhoneStatusBar.ALPHA_OUT);
+ anim.setInterpolator(Interpolators.ALPHA_OUT);
anim.start();
}
@@ -550,7 +554,7 @@
public void onTaskDataLoaded(Task task) {
// Bind each of the views to the new task data
mThumbnailView.rebindToTask(mTask);
- mHeaderView.rebindToTask(mTask);
+ mHeaderView.rebindToTask(mTask, mTouchExplorationEnabled);
mTaskDataLoaded = true;
}
@@ -559,13 +563,13 @@
// Unbind each of the views from the task data and remove the task callback
mTask.removeCallback(this);
mThumbnailView.unbindFromTask();
- mHeaderView.unbindFromTask();
+ mHeaderView.unbindFromTask(mTouchExplorationEnabled);
mTaskDataLoaded = false;
}
@Override
public void onTaskStackIdChanged() {
- mHeaderView.rebindToTask(mTask);
+ mHeaderView.rebindToTask(mTask, mTouchExplorationEnabled);
}
/**** View.OnClickListener Implementation ****/
@@ -620,4 +624,12 @@
}
EventBus.getDefault().unregister(this);
}
+
+ /**
+ * Reads current system flags related to accessibility and screen pinning.
+ */
+ private void readSystemFlags() {
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ mTouchExplorationEnabled = ssp.isTouchExplorationEnabled();
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewAnimation.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewAnimation.java
index 74b16d0..5455042 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewAnimation.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewAnimation.java
@@ -19,7 +19,8 @@
import android.animation.Animator;
import android.animation.AnimatorSet;
import android.view.animation.Interpolator;
-import android.view.animation.LinearInterpolator;
+
+import com.android.systemui.Interpolators;
import java.util.List;
@@ -29,7 +30,7 @@
public class TaskViewAnimation {
public static final TaskViewAnimation IMMEDIATE = new TaskViewAnimation(0,
- new LinearInterpolator());
+ Interpolators.LINEAR);
public final int startDelay;
public final int duration;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
index 36760f7..7cde463 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
@@ -37,13 +37,13 @@
import android.view.View;
import android.view.ViewAnimationUtils;
import android.view.ViewStub;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
+
import com.android.internal.logging.MetricsLogger;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.recents.Constants;
import com.android.systemui.recents.Recents;
@@ -163,10 +163,6 @@
// Header dim, which is only used when task view hardware layers are not used
private Paint mDimLayerPaint = new Paint();
- Interpolator mFastOutSlowInInterpolator;
- Interpolator mFastOutLinearInInterpolator;
- Interpolator mLinearOutSlowInInterpolator;
-
private CountDownTimer mFocusTimerCountDown;
public TaskViewHeader(Context context) {
@@ -200,13 +196,6 @@
mLightInfoIcon = context.getDrawable(R.drawable.recents_info_light);
mDarkInfoIcon = context.getDrawable(R.drawable.recents_info_dark);
- mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
- com.android.internal.R.interpolator.fast_out_slow_in);
- mFastOutLinearInInterpolator = AnimationUtils.loadInterpolator(context,
- com.android.internal.R.interpolator.fast_out_linear_in);
- mLinearOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
- com.android.internal.R.interpolator.linear_out_slow_in);
-
// Configure the background and dim
mBackground = new HighlightColorDrawable();
mBackground.setColorAndDim(Color.argb(255, 0, 0, 0), 0f);
@@ -225,70 +214,63 @@
@Override
protected void onFinishInflate() {
+ SystemServicesProxy ssp = Recents.getSystemServices();
+
// Initialize the icon and description views
mIconView = (ImageView) findViewById(R.id.icon);
mIconView.setClickable(false);
mIconView.setOnLongClickListener(this);
mTitleView = (TextView) findViewById(R.id.title);
mDismissButton = (ImageView) findViewById(R.id.dismiss_task);
- mDismissButton.setOnClickListener(this);
- mMoveTaskButton = (ImageView) findViewById(R.id.move_task);
+ if (ssp.hasFreeformWorkspaceSupport()) {
+ mMoveTaskButton = (ImageView) findViewById(R.id.move_task);
+ }
mFocusTimerIndicatorStub = (ViewStub) findViewById(R.id.focus_timer_indicator_stub);
mAppOverlayViewStub = (ViewStub) findViewById(R.id.app_overlay_stub);
}
+ @Override
+ protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+ super.onLayout(changed, left, top, right, bottom);
+
+ // Since we update the position of children based on the width of the parent and this view
+ // recompute these changes with the new view size
+ onTaskViewSizeChanged(mTaskViewRect.width(), mTaskViewRect.height());
+ }
+
/**
* Called when the task view frame changes, allowing us to move the contents of the header
* to match the frame changes.
*/
public void onTaskViewSizeChanged(int width, int height) {
- // TODO: Optimize this path
mTaskViewRect.set(0, 0, width, height);
- boolean updateMoveTaskButton = mMoveTaskButton.getVisibility() != View.GONE;
- boolean isFreeformTask = (mTask != null) && mTask.isFreeformTask();
- int appIconWidth = mIconView.getMeasuredWidth();
- int activityDescWidth = (mTask != null)
- ? (int) mTitleView.getPaint().measureText(mTask.title)
- : mTitleView.getMeasuredWidth();
- int dismissIconWidth = mDismissButton.getMeasuredWidth();
- int moveTaskIconWidth = mMoveTaskButton.getVisibility() == View.VISIBLE
- ? mMoveTaskButton.getMeasuredWidth()
- : 0;
- // Priority-wise, we show the activity icon first, the dismiss icon if there is room, the
- // move-task icon if there is room, and then finally, the activity label if there is room
- if (isFreeformTask && width < (appIconWidth + dismissIconWidth)) {
- mTitleView.setVisibility(View.INVISIBLE);
- if (updateMoveTaskButton) {
- mMoveTaskButton.setVisibility(View.INVISIBLE);
- }
- mDismissButton.setVisibility(View.INVISIBLE);
- } else if (isFreeformTask && width < (appIconWidth + dismissIconWidth +
- moveTaskIconWidth)) {
- mTitleView.setVisibility(View.INVISIBLE);
- if (updateMoveTaskButton) {
- mMoveTaskButton.setVisibility(View.INVISIBLE);
- }
- mDismissButton.setVisibility(View.VISIBLE);
- } else if (isFreeformTask && width < (appIconWidth + dismissIconWidth + moveTaskIconWidth +
- activityDescWidth)) {
- mTitleView.setVisibility(View.INVISIBLE);
- if (updateMoveTaskButton) {
- mMoveTaskButton.setVisibility(View.VISIBLE);
- }
- mDismissButton.setVisibility(View.VISIBLE);
- } else {
- mTitleView.setVisibility(View.VISIBLE);
- if (updateMoveTaskButton) {
- mMoveTaskButton.setVisibility(View.VISIBLE);
- }
- mDismissButton.setVisibility(View.VISIBLE);
+ boolean showTitle = true;
+ boolean showMoveIcon = true;
+ boolean showDismissIcon = true;
+ int rightInset = width - getMeasuredWidth();
+
+ if (mTask != null && mTask.isFreeformTask()) {
+ // For freeform tasks, we always show the app icon, and only show the title, move-task
+ // icon, and the dismiss icon if there is room
+ int appIconWidth = mIconView.getMeasuredWidth();
+ int titleWidth = (int) mTitleView.getPaint().measureText(mTask.title);
+ int dismissWidth = mDismissButton.getMeasuredWidth();
+ int moveTaskWidth = mMoveTaskButton != null
+ ? mMoveTaskButton.getMeasuredWidth()
+ : 0;
+ showTitle = width >= (appIconWidth + dismissWidth + moveTaskWidth + titleWidth);
+ showMoveIcon = width >= (appIconWidth + dismissWidth + moveTaskWidth);
+ showDismissIcon = width >= (appIconWidth + dismissWidth);
}
- if (updateMoveTaskButton) {
- mMoveTaskButton.setTranslationX(width - getMeasuredWidth());
+
+ mTitleView.setVisibility(showTitle ? View.VISIBLE : View.INVISIBLE);
+ if (mMoveTaskButton != null) {
+ mMoveTaskButton.setVisibility(showMoveIcon ? View.VISIBLE : View.INVISIBLE);
+ mMoveTaskButton.setTranslationX(rightInset);
}
- mDismissButton.setTranslationX(width - getMeasuredWidth());
- invalidate();
+ mDismissButton.setVisibility(showDismissIcon ? View.VISIBLE : View.INVISIBLE);
+ mDismissButton.setTranslationX(rightInset);
}
@Override
@@ -350,7 +332,6 @@
void setDimAlpha(float dimAlpha) {
mDimAlpha = dimAlpha;
updateBackgroundColor(dimAlpha);
- invalidate();
}
/**
@@ -364,12 +345,12 @@
mTmpHSL[2] = Math.min(1f, mTmpHSL[2] + OVERLAY_LIGHTNESS_INCREMENT * (1.0f - dimAlpha));
mOverlayBackground.setColorAndDim(ColorUtils.HSLToColor(mTmpHSL), dimAlpha);
mDimLayerPaint.setAlpha((int) (dimAlpha * 255));
+ invalidate();
}
}
/** Binds the bar view to the task */
- public void rebindToTask(Task t) {
- SystemServicesProxy ssp = Recents.getSystemServices();
+ public void rebindToTask(Task t, boolean touchExplorationEnabled) {
mTask = t;
// If an activity icon is defined, then we use that as the primary icon to show in the bar,
@@ -390,7 +371,7 @@
// When freeform workspaces are enabled, then update the move-task button depending on the
// current task
- if (ssp.hasFreeformWorkspaceSupport()) {
+ if (mMoveTaskButton != null) {
if (t.isFreeformTask()) {
mMoveTaskTargetStackId = FULLSCREEN_WORKSPACE_STACK_ID;
mMoveTaskButton.setImageDrawable(t.useLightOnPrimaryColor
@@ -402,10 +383,6 @@
? mLightFreeformIcon
: mDarkFreeformIcon);
}
- if (mMoveTaskButton.getVisibility() != View.VISIBLE) {
- mMoveTaskButton.setVisibility(View.VISIBLE);
- }
- mMoveTaskButton.setOnClickListener(this);
}
if (Recents.getDebugFlags().isFastToggleRecentsEnabled()) {
@@ -419,31 +396,46 @@
}
// In accessibility, a single click on the focused app info button will show it
- if (ssp.isTouchExplorationEnabled()) {
+ if (touchExplorationEnabled) {
mIconView.setOnClickListener(this);
}
}
/** Unbinds the bar view from the task */
- void unbindFromTask() {
+ void unbindFromTask(boolean touchExplorationEnabled) {
mTask = null;
mIconView.setImageDrawable(null);
- mIconView.setOnClickListener(null);
- mMoveTaskButton.setOnClickListener(null);
+ if (touchExplorationEnabled) {
+ mIconView.setOnClickListener(null);
+ }
}
/** Animates this task bar if the user does not interact with the stack after a certain time. */
void startNoUserInteractionAnimation() {
- if (mDismissButton.getVisibility() != View.VISIBLE) {
- mDismissButton.setVisibility(View.VISIBLE);
- mDismissButton.setAlpha(0f);
+ int duration = getResources().getInteger(R.integer.recents_task_enter_from_app_duration);
+ mDismissButton.setOnClickListener(this);
+ mDismissButton.setVisibility(View.VISIBLE);
+ if (mDismissButton.getVisibility() == VISIBLE) {
mDismissButton.animate()
.alpha(1f)
- .setStartDelay(0)
- .setInterpolator(mFastOutLinearInInterpolator)
- .setDuration(getResources().getInteger(
- R.integer.recents_task_enter_from_app_duration))
+ .setInterpolator(Interpolators.FAST_OUT_LINEAR_IN)
+ .setDuration(duration)
.start();
+ } else {
+ mDismissButton.setAlpha(1f);
+ }
+ if (mMoveTaskButton != null) {
+ if (mMoveTaskButton.getVisibility() == VISIBLE) {
+ mMoveTaskButton.setOnClickListener(this);
+ mMoveTaskButton.setVisibility(View.VISIBLE);
+ mMoveTaskButton.animate()
+ .alpha(1f)
+ .setInterpolator(Interpolators.FAST_OUT_LINEAR_IN)
+ .setDuration(duration)
+ .start();
+ } else {
+ mMoveTaskButton.setAlpha(1f);
+ }
}
}
@@ -452,10 +444,15 @@
* time.
*/
void setNoUserInteractionState() {
- if (mDismissButton.getVisibility() != View.VISIBLE) {
- mDismissButton.animate().cancel();
- mDismissButton.setVisibility(View.VISIBLE);
- mDismissButton.setAlpha(1f);
+ mDismissButton.setVisibility(View.VISIBLE);
+ mDismissButton.animate().cancel();
+ mDismissButton.setAlpha(1f);
+ mDismissButton.setOnClickListener(this);
+ if (mMoveTaskButton != null) {
+ mMoveTaskButton.setVisibility(View.VISIBLE);
+ mMoveTaskButton.animate().cancel();
+ mMoveTaskButton.setAlpha(1f);
+ mMoveTaskButton.setOnClickListener(this);
}
}
@@ -465,6 +462,13 @@
*/
void resetNoUserInteractionState() {
mDismissButton.setVisibility(View.INVISIBLE);
+ mDismissButton.setAlpha(0f);
+ mDismissButton.setOnClickListener(null);
+ if (mMoveTaskButton != null) {
+ mMoveTaskButton.setVisibility(View.INVISIBLE);
+ mMoveTaskButton.setAlpha(0f);
+ mMoveTaskButton.setOnClickListener(null);
+ }
}
@Override
@@ -478,11 +482,8 @@
@Override
public void onClick(View v) {
if (v == mIconView) {
- SystemServicesProxy ssp = Recents.getSystemServices();
- if (ssp.isTouchExplorationEnabled()) {
- // In accessibility, a single click on the focused app info button will show it
- EventBus.getDefault().send(new ShowApplicationInfoEvent(mTask));
- }
+ // In accessibility, a single click on the focused app info button will show it
+ EventBus.getDefault().send(new ShowApplicationInfoEvent(mTask));
} else if (v == mDismissButton) {
TaskView tv = Utilities.findParent(this, TaskView.class);
tv.dismissTask();
@@ -557,7 +558,7 @@
Animator revealAnim = ViewAnimationUtils.createCircularReveal(mAppOverlayView, x, y, 0,
getWidth());
revealAnim.setDuration(OVERLAY_REVEAL_DURATION);
- revealAnim.setInterpolator(mLinearOutSlowInInterpolator);
+ revealAnim.setInterpolator(Interpolators.LINEAR_OUT_SLOW_IN);
revealAnim.start();
}
@@ -578,7 +579,7 @@
Animator revealAnim = ViewAnimationUtils.createCircularReveal(mAppOverlayView, x, y,
getWidth(), 0);
revealAnim.setDuration(OVERLAY_REVEAL_DURATION);
- revealAnim.setInterpolator(mLinearOutSlowInInterpolator);
+ revealAnim.setInterpolator(Interpolators.LINEAR_OUT_SLOW_IN);
revealAnim.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java
index c3a0ac9..f90951e 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java
@@ -28,8 +28,7 @@
import android.graphics.Shader;
import android.util.AttributeSet;
import android.view.View;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
+
import com.android.systemui.R;
import com.android.systemui.recents.model.Task;
@@ -52,8 +51,6 @@
BitmapShader mBitmapShader;
LightingColorFilter mLightingColorFilter = new LightingColorFilter(0xffffffff, 0);
- Interpolator mFastOutSlowInInterpolator;
-
// Task bar clipping, the top of this thumbnail can be clipped against the opaque header
// bar that overlaps this thumbnail
View mTaskBar;
@@ -82,8 +79,6 @@
mDrawPaint.setAntiAlias(true);
mCornerRadius = getResources().getDimensionPixelSize(
R.dimen.recents_task_view_rounded_corners_radius);
- mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
- com.android.internal.R.interpolator.fast_out_slow_in);
}
/**
@@ -98,7 +93,6 @@
mTaskViewRect.set(0, 0, width, height);
updateThumbnailScale();
- invalidate();
}
@Override
@@ -125,7 +119,6 @@
mDrawPaint.setShader(null);
mThumbnailRect.setEmpty();
}
- invalidate();
}
/** Updates the paint to draw the thumbnail. */
@@ -143,7 +136,9 @@
mDrawPaint.setColorFilter(null);
mDrawPaint.setColor(Color.argb(255, grey, grey, grey));
}
- invalidate();
+ if (!mInvisible) {
+ invalidate();
+ }
}
/**
diff --git a/packages/SystemUI/src/com/android/systemui/settings/CurrentUserTracker.java b/packages/SystemUI/src/com/android/systemui/settings/CurrentUserTracker.java
index d8a202c..dd80750 100644
--- a/packages/SystemUI/src/com/android/systemui/settings/CurrentUserTracker.java
+++ b/packages/SystemUI/src/com/android/systemui/settings/CurrentUserTracker.java
@@ -21,7 +21,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.os.UserHandle;
public abstract class CurrentUserTracker extends BroadcastReceiver {
diff --git a/packages/SystemUI/src/com/android/systemui/settings/ToggleSeekBar.java b/packages/SystemUI/src/com/android/systemui/settings/ToggleSeekBar.java
index 8829794..722aba5 100644
--- a/packages/SystemUI/src/com/android/systemui/settings/ToggleSeekBar.java
+++ b/packages/SystemUI/src/com/android/systemui/settings/ToggleSeekBar.java
@@ -19,7 +19,6 @@
import android.content.Context;
import android.util.AttributeSet;
import android.view.MotionEvent;
-import android.view.View;
import android.view.accessibility.AccessibilityNodeInfo;
import android.widget.SeekBar;
diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java
index dca7fd9..0b20f7a 100644
--- a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java
+++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java
@@ -46,9 +46,9 @@
import android.widget.FrameLayout;
import com.android.internal.policy.DividerSnapAlgorithm;
+import com.android.internal.policy.DividerSnapAlgorithm.SnapTarget;
import com.android.internal.policy.DockedDividerUtils;
import com.android.systemui.R;
-import com.android.internal.policy.DividerSnapAlgorithm.SnapTarget;
import com.android.systemui.recents.events.EventBus;
import com.android.systemui.recents.events.activity.DockingTopTaskEvent;
import com.android.systemui.recents.events.activity.RecentsActivityStartingEvent;
diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java b/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java
index 67bb58a..24ab506 100644
--- a/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java
+++ b/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java
@@ -97,7 +97,8 @@
@Override
public void run() {
try {
- ActivityManagerNative.getDefault().resizeStack(DOCKED_STACK_ID, null, true);
+ ActivityManagerNative.getDefault().resizeStack(DOCKED_STACK_ID, null, true, false,
+ false);
} catch (RemoteException e) {
Log.w(TAG, "Failed to resize stack: " + e);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
index 01bfcea..874defa 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
@@ -32,6 +32,7 @@
import android.view.animation.Interpolator;
import android.view.animation.PathInterpolator;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.classifier.FalsingManager;
import com.android.systemui.statusbar.stack.NotificationStackScrollLayout;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/AnimatedImageView.java b/packages/SystemUI/src/com/android/systemui/statusbar/AnimatedImageView.java
index 90f7c08..7670223 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/AnimatedImageView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/AnimatedImageView.java
@@ -21,7 +21,6 @@
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.View;
-import android.widget.ImageView;
import android.widget.RemoteViews.RemoteView;
@RemoteView
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index 5359dd2..333e4ff 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -18,7 +18,6 @@
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
-import android.animation.TimeInterpolator;
import android.app.ActivityManager;
import android.app.ActivityManagerNative;
import android.app.Notification;
@@ -76,7 +75,6 @@
import android.view.WindowManager;
import android.view.WindowManagerGlobal;
import android.view.accessibility.AccessibilityManager;
-import android.view.animation.AnimationUtils;
import android.widget.ImageView;
import android.widget.RemoteViews;
import android.widget.TextView;
@@ -86,10 +84,10 @@
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.statusbar.IStatusBarService;
import com.android.internal.statusbar.StatusBarIcon;
-import com.android.internal.util.NotificationColorUtil;
import com.android.internal.widget.LockPatternUtils;
import com.android.keyguard.KeyguardUpdateMonitor;
import com.android.systemui.DejankUtils;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.RecentsComponent;
import com.android.systemui.SwipeHelper;
@@ -828,30 +826,25 @@
}
}
- protected View updateNotificationVetoButton(View row, StatusBarNotification n) {
+ protected View bindVetoButtonClickListener(View row, StatusBarNotification n) {
View vetoButton = row.findViewById(R.id.veto);
- if (n.isClearable()) {
- final String _pkg = n.getPackageName();
- final String _tag = n.getTag();
- final int _id = n.getId();
- final int _userId = n.getUserId();
- vetoButton.setOnClickListener(new View.OnClickListener() {
- public void onClick(View v) {
- // Accessibility feedback
- v.announceForAccessibility(
- mContext.getString(R.string.accessibility_notification_dismissed));
- try {
- mBarService.onNotificationClear(_pkg, _tag, _id, _userId);
+ final String _pkg = n.getPackageName();
+ final String _tag = n.getTag();
+ final int _id = n.getId();
+ final int _userId = n.getUserId();
+ vetoButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ // Accessibility feedback
+ v.announceForAccessibility(
+ mContext.getString(R.string.accessibility_notification_dismissed));
+ try {
+ mBarService.onNotificationClear(_pkg, _tag, _id, _userId);
- } catch (RemoteException ex) {
- // system process is dead if we're here.
- }
- }
- });
- vetoButton.setVisibility(View.VISIBLE);
- } else {
- vetoButton.setVisibility(View.GONE);
- }
+ } catch (RemoteException ex) {
+ // system process is dead if we're here.
+ }
+ }
+ });
vetoButton.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
return vetoButton;
}
@@ -1175,7 +1168,7 @@
}
protected void toggleKeyboardShortcuts() {
- getKeyboardShortcuts().toggleKeyboardShortcuts(mContext);
+ getKeyboardShortcuts().toggleKeyboardShortcuts();
}
protected void cancelPreloadingRecents() {
@@ -1225,10 +1218,7 @@
final boolean allowedByUser = 0 != Settings.Secure.getIntForUser(
mContext.getContentResolver(),
Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0, userHandle);
- final int dpmFlags = mDevicePolicyManager.getKeyguardDisabledFeatures(null /* admin */,
- userHandle);
- final boolean allowedByDpm = (dpmFlags
- & DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS) == 0;
+ final boolean allowedByDpm = adminAllowsUnredactedNotifications(userHandle);
final boolean allowed = allowedByUser && allowedByDpm;
mUsersAllowingPrivateNotifications.append(userHandle, allowed);
return allowed;
@@ -1237,6 +1227,15 @@
return mUsersAllowingPrivateNotifications.get(userHandle);
}
+ private boolean adminAllowsUnredactedNotifications(int userHandle) {
+ if (userHandle == UserHandle.USER_ALL) {
+ return true;
+ }
+ final int dpmFlags = mDevicePolicyManager.getKeyguardDisabledFeatures(null /* admin */,
+ userHandle);
+ return (dpmFlags & DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS) == 0;
+ }
+
/**
* Returns true if we're on a secure lockscreen and the user wants to hide "sensitive"
* notification data. If so, private notifications should show their (possibly
@@ -1364,7 +1363,7 @@
}
workAroundBadLayerDrawableOpacity(row);
- View vetoButton = updateNotificationVetoButton(row, sbn);
+ View vetoButton = bindVetoButtonClickListener(row, sbn);
vetoButton.setContentDescription(mContext.getString(
R.string.accessibility_remove_notification));
@@ -1512,7 +1511,7 @@
protected KeyboardShortcuts getKeyboardShortcuts() {
if (mKeyboardShortcuts == null) {
- mKeyboardShortcuts = new KeyboardShortcuts();
+ mKeyboardShortcuts = new KeyboardShortcuts(mContext);
}
return mKeyboardShortcuts;
@@ -2004,7 +2003,7 @@
// Update the veto button accordingly (and as a result, whether this row is
// swipe-dismissable)
- updateNotificationVetoButton(entry.row, notification);
+ bindVetoButtonClickListener(entry.row, notification);
if (DEBUG) {
// Is this for you?
@@ -2047,6 +2046,21 @@
entry.row.resetHeight();
}
+ protected void updatePublicContentView(Entry entry,
+ StatusBarNotification sbn) {
+ final RemoteViews publicContentView = entry.cachedPublicContentView;
+ if (publicContentView != null && entry.getPublicContentView() != null) {
+ final boolean disabledByPolicy =
+ !adminAllowsUnredactedNotifications(entry.notification.getUserId());
+ publicContentView.setTextViewText(android.R.id.title,
+ mContext.getString(disabledByPolicy
+ ? com.android.internal.R.string.notification_hidden_by_policy_text
+ : com.android.internal.R.string.notification_hidden_text));
+ publicContentView.reapply(sbn.getPackageContext(mContext),
+ entry.getPublicContentView(), mOnClickHandler);
+ }
+ }
+
protected void notifyHeadsUpScreenOff() {
maybeEscalateHeadsUp();
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
index cc26223..de6e7fe 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
@@ -21,6 +21,7 @@
import android.os.IBinder;
import android.os.Message;
import android.util.Pair;
+
import com.android.internal.statusbar.IStatusBar;
import com.android.internal.statusbar.StatusBarIcon;
@@ -39,31 +40,32 @@
private static final int OP_SET_ICON = 1;
private static final int OP_REMOVE_ICON = 2;
- private static final int MSG_ICON = 1 << MSG_SHIFT;
- private static final int MSG_DISABLE = 2 << MSG_SHIFT;
- private static final int MSG_EXPAND_NOTIFICATIONS = 3 << MSG_SHIFT;
- private static final int MSG_COLLAPSE_PANELS = 4 << MSG_SHIFT;
- private static final int MSG_EXPAND_SETTINGS = 5 << MSG_SHIFT;
- private static final int MSG_SET_SYSTEMUI_VISIBILITY = 6 << MSG_SHIFT;
- private static final int MSG_TOP_APP_WINDOW_CHANGED = 7 << MSG_SHIFT;
- private static final int MSG_SHOW_IME_BUTTON = 8 << MSG_SHIFT;
- private static final int MSG_TOGGLE_RECENT_APPS = 9 << MSG_SHIFT;
- private static final int MSG_PRELOAD_RECENT_APPS = 10 << MSG_SHIFT;
- private static final int MSG_CANCEL_PRELOAD_RECENT_APPS = 11 << MSG_SHIFT;
- private static final int MSG_SET_WINDOW_STATE = 12 << MSG_SHIFT;
- private static final int MSG_SHOW_RECENT_APPS = 13 << MSG_SHIFT;
- private static final int MSG_HIDE_RECENT_APPS = 14 << MSG_SHIFT;
- private static final int MSG_BUZZ_BEEP_BLINKED = 15 << MSG_SHIFT;
- private static final int MSG_NOTIFICATION_LIGHT_OFF = 16 << MSG_SHIFT;
- private static final int MSG_NOTIFICATION_LIGHT_PULSE = 17 << MSG_SHIFT;
- private static final int MSG_SHOW_SCREEN_PIN_REQUEST = 18 << MSG_SHIFT;
- private static final int MSG_APP_TRANSITION_PENDING = 19 << MSG_SHIFT;
- private static final int MSG_APP_TRANSITION_CANCELLED = 20 << MSG_SHIFT;
- private static final int MSG_APP_TRANSITION_STARTING = 21 << MSG_SHIFT;
- private static final int MSG_ASSIST_DISCLOSURE = 22 << MSG_SHIFT;
- private static final int MSG_START_ASSIST = 23 << MSG_SHIFT;
- private static final int MSG_CAMERA_LAUNCH_GESTURE = 24 << MSG_SHIFT;
- private static final int MSG_TOGGLE_KEYBOARD_SHORTCUTS = 25 << MSG_SHIFT;
+ private static final int MSG_ICON = 1 << MSG_SHIFT;
+ private static final int MSG_DISABLE = 2 << MSG_SHIFT;
+ private static final int MSG_EXPAND_NOTIFICATIONS = 3 << MSG_SHIFT;
+ private static final int MSG_COLLAPSE_PANELS = 4 << MSG_SHIFT;
+ private static final int MSG_EXPAND_SETTINGS = 5 << MSG_SHIFT;
+ private static final int MSG_SET_SYSTEMUI_VISIBILITY = 6 << MSG_SHIFT;
+ private static final int MSG_TOP_APP_WINDOW_CHANGED = 7 << MSG_SHIFT;
+ private static final int MSG_SHOW_IME_BUTTON = 8 << MSG_SHIFT;
+ private static final int MSG_TOGGLE_RECENT_APPS = 9 << MSG_SHIFT;
+ private static final int MSG_PRELOAD_RECENT_APPS = 10 << MSG_SHIFT;
+ private static final int MSG_CANCEL_PRELOAD_RECENT_APPS = 11 << MSG_SHIFT;
+ private static final int MSG_SET_WINDOW_STATE = 12 << MSG_SHIFT;
+ private static final int MSG_SHOW_RECENT_APPS = 13 << MSG_SHIFT;
+ private static final int MSG_HIDE_RECENT_APPS = 14 << MSG_SHIFT;
+ private static final int MSG_BUZZ_BEEP_BLINKED = 15 << MSG_SHIFT;
+ private static final int MSG_NOTIFICATION_LIGHT_OFF = 16 << MSG_SHIFT;
+ private static final int MSG_NOTIFICATION_LIGHT_PULSE = 17 << MSG_SHIFT;
+ private static final int MSG_SHOW_SCREEN_PIN_REQUEST = 18 << MSG_SHIFT;
+ private static final int MSG_APP_TRANSITION_PENDING = 19 << MSG_SHIFT;
+ private static final int MSG_APP_TRANSITION_CANCELLED = 20 << MSG_SHIFT;
+ private static final int MSG_APP_TRANSITION_STARTING = 21 << MSG_SHIFT;
+ private static final int MSG_ASSIST_DISCLOSURE = 22 << MSG_SHIFT;
+ private static final int MSG_START_ASSIST = 23 << MSG_SHIFT;
+ private static final int MSG_CAMERA_LAUNCH_GESTURE = 24 << MSG_SHIFT;
+ private static final int MSG_TOGGLE_KEYBOARD_SHORTCUTS = 25 << MSG_SHIFT;
+ private static final int MSG_REQUEST_TV_PICTURE_IN_PICTURE = 26 << MSG_SHIFT;
public static final int FLAG_EXCLUDE_NONE = 0;
public static final int FLAG_EXCLUDE_SEARCH_PANEL = 1 << 0;
@@ -109,6 +111,7 @@
public void showAssistDisclosure();
public void startAssist(Bundle args);
public void onCameraLaunchGestureDetected(int source);
+ public void requestTvPictureInPicture();
}
public CommandQueue(Callbacks callbacks) {
@@ -230,6 +233,14 @@
}
}
+ @Override
+ public void requestTvPictureInPicture() {
+ synchronized (mLock) {
+ mHandler.removeMessages(MSG_REQUEST_TV_PICTURE_IN_PICTURE);
+ mHandler.obtainMessage(MSG_REQUEST_TV_PICTURE_IN_PICTURE).sendToTarget();
+ }
+ }
+
public void setWindowState(int window, int state) {
synchronized (mLock) {
// don't coalesce these
@@ -398,6 +409,9 @@
case MSG_CAMERA_LAUNCH_GESTURE:
mCallbacks.onCameraLaunchGestureDetected(msg.arg1);
break;
+ case MSG_REQUEST_TV_PICTURE_IN_PICTURE:
+ mCallbacks.requestTvPictureInPicture();
+ break;
}
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CrossFadeHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/CrossFadeHelper.java
index 24cd948..212d290 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/CrossFadeHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/CrossFadeHelper.java
@@ -18,7 +18,7 @@
import android.view.View;
-import com.android.systemui.statusbar.phone.PhoneStatusBar;
+import com.android.systemui.Interpolators;
/**
* A helper to fade views in and out.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/DismissViewButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/DismissViewButton.java
index a323684..46060f1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/DismissViewButton.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/DismissViewButton.java
@@ -25,6 +25,7 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
+
import com.android.systemui.R;
import com.android.systemui.statusbar.stack.NotificationStackScrollLayout;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java
index 5c83f5f..b326552 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java
@@ -27,6 +27,7 @@
import com.android.systemui.ExpandHelper;
import com.android.systemui.Gefingerpoken;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.classifier.FalsingManager;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index 6fae3ab..7f1316f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@ -28,7 +28,6 @@
import android.view.MotionEvent;
import android.view.NotificationHeaderView;
import android.view.View;
-import android.view.ViewGroup;
import android.view.ViewStub;
import android.view.accessibility.AccessibilityEvent;
import android.widget.Chronometer;
@@ -212,7 +211,8 @@
mStatusBarNotification = entry.notification;
mPrivateLayout.onNotificationUpdated(entry);
mPublicLayout.onNotificationUpdated(entry);
- updateVetoButton();
+ mShowingPublicInitialized = false;
+ updateClearability();
if (mIsSummaryWithChildren) {
recreateNotificationHeader();
}
@@ -911,7 +911,7 @@
}
mPrivateLayout.updateExpandButtons(isExpandable());
- updateVetoButton();
+ updateClearability();
mShowingPublicInitialized = true;
}
@@ -947,7 +947,7 @@
}
}
- private void updateVetoButton() {
+ private void updateClearability() {
// public versions cannot be dismissed
mVetoButton.setVisibility(isClearable() && !mShowingPublic ? View.VISIBLE : View.GONE);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/FlingAnimationUtils.java b/packages/SystemUI/src/com/android/systemui/statusbar/FlingAnimationUtils.java
index c4ffd7f..bddd3e6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/FlingAnimationUtils.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/FlingAnimationUtils.java
@@ -22,6 +22,8 @@
import android.view.animation.Interpolator;
import android.view.animation.PathInterpolator;
+import com.android.systemui.Interpolators;
+
/**
* Utility class to calculate general fling animation when the finger is released.
*/
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
index b36fb7e..963920c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
@@ -19,25 +19,30 @@
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
-import android.graphics.drawable.ColorDrawable;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
import android.os.Handler;
-import android.util.Log;
+import android.os.Looper;
+import android.util.DisplayMetrics;
import android.view.KeyEvent;
import android.view.KeyboardShortcutGroup;
import android.view.KeyboardShortcutInfo;
import android.view.LayoutInflater;
import android.view.View;
+import android.view.ViewGroup.LayoutParams;
import android.view.Window;
-import android.view.WindowManager;
import android.view.WindowManager.KeyboardShortcutsReceiver;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
import com.android.systemui.R;
import com.android.systemui.recents.Recents;
+import java.util.ArrayList;
import java.util.List;
import static android.content.Context.LAYOUT_INFLATER_SERVICE;
-import static android.graphics.Color.TRANSPARENT;
import static android.view.Gravity.TOP;
import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG;
@@ -45,33 +50,44 @@
* Contains functionality for handling keyboard shortcuts.
*/
public class KeyboardShortcuts {
- private static final String TAG = "KeyboardShortcuts";
+ private static final char SYSTEM_HOME_BASE_CHARACTER = '\u2386';
+ private static final char SYSTEM_BACK_BASE_CHARACTER = '\u007F';
+ private static final char SYSTEM_RECENTS_BASE_CHARACTER = '\u0009';
+
+ private final Handler mHandler = new Handler(Looper.getMainLooper());
+ private final Context mContext;
+ private final OnClickListener dialogCloseListener = new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ dismissKeyboardShortcutsDialog();
+ }
+ };
private Dialog mKeyboardShortcutsDialog;
- public KeyboardShortcuts() {}
+ public KeyboardShortcuts(Context context) {
+ this.mContext = context;
+ }
- public void toggleKeyboardShortcuts(final Context context) {
+ public void toggleKeyboardShortcuts() {
if (mKeyboardShortcutsDialog == null) {
- Recents.getSystemServices().requestKeyboardShortcuts(context,
+ Recents.getSystemServices().requestKeyboardShortcuts(mContext,
new KeyboardShortcutsReceiver() {
@Override
public void onKeyboardShortcutsReceived(
final List<KeyboardShortcutGroup> result) {
KeyboardShortcutGroup systemGroup = new KeyboardShortcutGroup(
- context.getString(R.string.keyboard_shortcut_group_system));
+ mContext.getString(R.string.keyboard_shortcut_group_system), true);
systemGroup.addItem(new KeyboardShortcutInfo(
- context.getString(R.string.keyboard_shortcut_group_system_home),
- '\u2386', KeyEvent.META_META_ON));
+ mContext.getString(R.string.keyboard_shortcut_group_system_home),
+ SYSTEM_HOME_BASE_CHARACTER, KeyEvent.META_META_ON));
systemGroup.addItem(new KeyboardShortcutInfo(
- context.getString(R.string.keyboard_shortcut_group_system_back),
- '\u007F', KeyEvent.META_META_ON));
+ mContext.getString(R.string.keyboard_shortcut_group_system_back),
+ SYSTEM_BACK_BASE_CHARACTER, KeyEvent.META_META_ON));
systemGroup.addItem(new KeyboardShortcutInfo(
- context.getString(R.string.keyboard_shortcut_group_system_recents),
- '\u0009', KeyEvent.META_ALT_ON));
+ mContext.getString(R.string.keyboard_shortcut_group_system_recents),
+ SYSTEM_RECENTS_BASE_CHARACTER, KeyEvent.META_ALT_ON));
result.add(systemGroup);
- Log.i(TAG, "Keyboard shortcuts received: " + String.valueOf(result));
- showKeyboardShortcutsDialog(context);
+ showKeyboardShortcutsDialog(result);
}
});
} else {
@@ -79,33 +95,6 @@
}
}
- private void showKeyboardShortcutsDialog(Context context) {
- // Create dialog.
- AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context);
- LayoutInflater inflater = (LayoutInflater) context.getSystemService(
- LAYOUT_INFLATER_SERVICE);
- final View keyboardShortcutsView = inflater.inflate(
- R.layout.keyboard_shortcuts_view, null);
-
- populateKeyboardShortcuts(keyboardShortcutsView.findViewById(
- R.id.keyboard_shortcuts_wrapper));
- dialogBuilder.setView(keyboardShortcutsView);
- mKeyboardShortcutsDialog = dialogBuilder.create();
- mKeyboardShortcutsDialog.setCanceledOnTouchOutside(true);
-
- // Setup window.
- Window keyboardShortcutsWindow = mKeyboardShortcutsDialog.getWindow();
- keyboardShortcutsWindow.setType(TYPE_SYSTEM_DIALOG);
- keyboardShortcutsWindow.setBackgroundDrawable(
- new ColorDrawable(TRANSPARENT));
- keyboardShortcutsWindow.setGravity(TOP);
- keyboardShortcutsView.post(new Runnable() {
- public void run() {
- mKeyboardShortcutsDialog.show();
- }
- });
- }
-
public void dismissKeyboardShortcutsDialog() {
if (mKeyboardShortcutsDialog != null) {
mKeyboardShortcutsDialog.dismiss();
@@ -113,11 +102,99 @@
}
}
- /**
- * @return {@code true} if the keyboard shortcuts have been successfully populated.
- */
- private boolean populateKeyboardShortcuts(View keyboardShortcutsLayout) {
- // TODO: Populate shortcuts.
- return true;
+ private void showKeyboardShortcutsDialog(
+ final List<KeyboardShortcutGroup> keyboardShortcutGroups) {
+ // Need to post on the main thread.
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ // TODO: break all this code out into a handleShowKeyboard...
+ // Might add more things posted; should consider adding a custom handler so
+ // you can send the keyboardShortcutsGroups as part of the message.
+ AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(mContext);
+ LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(
+ LAYOUT_INFLATER_SERVICE);
+ final View keyboardShortcutsView = inflater.inflate(
+ R.layout.keyboard_shortcuts_view, null);
+ DisplayMetrics dm = mContext.getResources().getDisplayMetrics();
+ ScrollView scrollView = (ScrollView) keyboardShortcutsView.findViewById(
+ R.id.keyboard_shortcuts_scroll_view);
+ // TODO: find a better way to set the height.
+ scrollView.setLayoutParams(new LinearLayout.LayoutParams(
+ LayoutParams.WRAP_CONTENT,
+ (int) (dm.heightPixels * dm.density)));
+
+ populateKeyboardShortcuts((LinearLayout) keyboardShortcutsView.findViewById(
+ R.id.keyboard_shortcuts_container), keyboardShortcutGroups);
+ dialogBuilder.setView(keyboardShortcutsView);
+ dialogBuilder.setPositiveButton(R.string.quick_settings_done, dialogCloseListener);
+ mKeyboardShortcutsDialog = dialogBuilder.create();
+ mKeyboardShortcutsDialog.setCanceledOnTouchOutside(true);
+
+ // Setup window.
+ Window keyboardShortcutsWindow = mKeyboardShortcutsDialog.getWindow();
+ keyboardShortcutsWindow.setType(TYPE_SYSTEM_DIALOG);
+ keyboardShortcutsWindow.setBackgroundDrawable(
+ mContext.getDrawable(R.color.ksh_dialog_background_color));
+ keyboardShortcutsWindow.setGravity(TOP);
+ mKeyboardShortcutsDialog.show();
+ }
+ });
+ }
+
+ private void populateKeyboardShortcuts(LinearLayout keyboardShortcutsLayout,
+ List<KeyboardShortcutGroup> keyboardShortcutGroups) {
+ LayoutInflater inflater = LayoutInflater.from(mContext);
+ final int keyboardShortcutGroupsSize = keyboardShortcutGroups.size();
+ for (int i = 0; i < keyboardShortcutGroupsSize; i++) {
+ KeyboardShortcutGroup group = keyboardShortcutGroups.get(i);
+ TextView categoryTitle = (TextView) inflater.inflate(
+ R.layout.keyboard_shortcuts_category_title, keyboardShortcutsLayout, false);
+ categoryTitle.setText(group.getLabel());
+ categoryTitle.setTextColor(group.isSystemGroup()
+ ? mContext.getColor(R.color.ksh_system_group_color)
+ : mContext.getColor(R.color.ksh_application_group_color));
+ keyboardShortcutsLayout.addView(categoryTitle);
+
+ LinearLayout shortcutWrapper = (LinearLayout) inflater.inflate(
+ R.layout.keyboard_shortcuts_wrapper, null);
+ final int itemsSize = group.getItems().size();
+ for (int j = 0; j < itemsSize; j++) {
+ KeyboardShortcutInfo info = group.getItems().get(j);
+ View shortcutView = inflater.inflate(R.layout.keyboard_shortcut_app_item, null);
+ TextView textView = (TextView) shortcutView
+ .findViewById(R.id.keyboard_shortcuts_keyword);
+ textView.setText(info.getLabel());
+
+ List<String> shortcutKeys = getHumanReadableShortcutKeys(info);
+ final int shortcutKeysSize = shortcutKeys.size();
+ for (int k = 0; k < shortcutKeysSize; k++) {
+ String shortcutKey = shortcutKeys.get(k);
+ TextView shortcutKeyView = (TextView) inflater.inflate(
+ R.layout.keyboard_shortcuts_key_view, null);
+ shortcutKeyView.setText(shortcutKey);
+ LinearLayout shortcutItemsContainer = (LinearLayout) shortcutView
+ .findViewById(R.id.keyboard_shortcuts_item_container);
+ shortcutItemsContainer.addView(shortcutKeyView);
+ }
+ shortcutWrapper.addView(shortcutView);
+ }
+
+ // TODO: merge container and wrapper into one xml file - wrapper is always a child of
+ // container.
+ LinearLayout shortcutsContainer = (LinearLayout) inflater.inflate(
+ R.layout.keyboard_shortcuts_container, null);
+ shortcutsContainer.addView(shortcutWrapper);
+ keyboardShortcutsLayout.addView(shortcutsContainer);
+ }
+ }
+
+ private List<String> getHumanReadableShortcutKeys(KeyboardShortcutInfo info) {
+ // TODO: fix the shortcuts. Find or build an util which can produce human readable
+ // names of the baseCharacter and the modifiers.
+ List<String> shortcutKeys = new ArrayList<>();
+ shortcutKeys.add(KeyEvent.metaStateToString(info.getModifiers()).toUpperCase());
+ shortcutKeys.add(Character.getName(info.getBaseCharacter()).toUpperCase());
+ return shortcutKeys;
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
index 841b9d0..0b1984d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
@@ -36,6 +36,7 @@
import android.view.animation.Interpolator;
import android.widget.ImageView;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.statusbar.phone.KeyguardAffordanceHelper;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
index 635e66d..00b9888 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
@@ -19,7 +19,6 @@
import android.app.Notification;
import android.app.RemoteInput;
import android.content.Context;
-import android.graphics.Outline;
import android.graphics.Rect;
import android.os.Build;
import android.service.notification.StatusBarNotification;
@@ -27,7 +26,6 @@
import android.view.NotificationHeaderView;
import android.view.View;
import android.view.ViewGroup;
-import android.view.ViewOutlineProvider;
import android.view.ViewTreeObserver;
import android.widget.FrameLayout;
@@ -53,6 +51,7 @@
private final Rect mClipBounds = new Rect();
private final int mMinContractedHeight;
+ private final int mNotificationContentMarginEnd;
private final OnLayoutChangeListener mLayoutUpdater = new OnLayoutChangeListener() {
@Override
public void onLayoutChange(View v, int left, int top, int right, int bottom,
@@ -109,6 +108,8 @@
mHybridViewManager = new HybridNotificationViewManager(getContext(), this);
mMinContractedHeight = getResources().getDimensionPixelSize(
R.dimen.min_notification_layout_height);
+ mNotificationContentMarginEnd = getResources().getDimensionPixelSize(
+ com.android.internal.R.dimen.notification_content_margin_end);
reset(true);
}
@@ -128,6 +129,19 @@
maxSize = MeasureSpec.getSize(heightMeasureSpec);
}
int maxChildHeight = 0;
+ if (mExpandedChild != null) {
+ int size = Math.min(maxSize, mNotificationMaxHeight);
+ ViewGroup.LayoutParams layoutParams = mExpandedChild.getLayoutParams();
+ if (layoutParams.height >= 0) {
+ // An actual height is set
+ size = Math.min(maxSize, layoutParams.height);
+ }
+ int spec = size == Integer.MAX_VALUE
+ ? MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)
+ : MeasureSpec.makeMeasureSpec(size, MeasureSpec.AT_MOST);
+ mExpandedChild.measure(widthMeasureSpec, spec);
+ maxChildHeight = Math.max(maxChildHeight, mExpandedChild.getMeasuredHeight());
+ }
if (mContractedChild != null) {
int heightSpec;
if (shouldContractedBeFixedSize()) {
@@ -143,19 +157,9 @@
mContractedChild.measure(widthMeasureSpec, heightSpec);
}
maxChildHeight = Math.max(maxChildHeight, measuredHeight);
- }
- if (mExpandedChild != null) {
- int size = Math.min(maxSize, mNotificationMaxHeight);
- ViewGroup.LayoutParams layoutParams = mExpandedChild.getLayoutParams();
- if (layoutParams.height >= 0) {
- // An actual height is set
- size = Math.min(maxSize, layoutParams.height);
+ if (updateContractedHeaderWidth()) {
+ mContractedChild.measure(widthMeasureSpec, heightSpec);
}
- int spec = size == Integer.MAX_VALUE
- ? MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)
- : MeasureSpec.makeMeasureSpec(size, MeasureSpec.AT_MOST);
- mExpandedChild.measure(widthMeasureSpec, spec);
- maxChildHeight = Math.max(maxChildHeight, mExpandedChild.getMeasuredHeight());
}
if (mHeadsUpChild != null) {
int size = Math.min(maxSize, mHeadsUpHeight);
@@ -178,6 +182,44 @@
setMeasuredDimension(width, ownHeight);
}
+ private boolean updateContractedHeaderWidth() {
+ // We need to update the expanded and the collapsed header to have exactly the same with to
+ // have the expand buttons laid out at the same location.
+ NotificationHeaderView contractedHeader = mContractedWrapper.getNotificationHeader();
+ if (contractedHeader != null) {
+ if (mExpandedChild != null
+ && mExpandedWrapper.getNotificationHeader() != null) {
+ NotificationHeaderView expandedHeader = mExpandedWrapper.getNotificationHeader();
+ int expandedSize = expandedHeader.getMeasuredWidth()
+ - expandedHeader.getPaddingEnd();
+ int collapsedSize = contractedHeader.getMeasuredWidth()
+ - expandedHeader.getPaddingEnd();
+ if (expandedSize != collapsedSize) {
+ int paddingEnd = contractedHeader.getMeasuredWidth() - expandedSize;
+ contractedHeader.setPadding(
+ isLayoutRtl() ? paddingEnd : contractedHeader.getPaddingLeft(),
+ contractedHeader.getPaddingTop(),
+ isLayoutRtl() ? contractedHeader.getPaddingLeft() : paddingEnd,
+ contractedHeader.getPaddingBottom());
+ contractedHeader.setShowWorkBadgeAtEnd(true);
+ return true;
+ }
+ } else {
+ int paddingEnd = mNotificationContentMarginEnd;
+ if (contractedHeader.getPaddingEnd() != paddingEnd) {
+ contractedHeader.setPadding(
+ isLayoutRtl() ? paddingEnd : contractedHeader.getPaddingLeft(),
+ contractedHeader.getPaddingTop(),
+ isLayoutRtl() ? contractedHeader.getPaddingLeft() : paddingEnd,
+ contractedHeader.getPaddingBottom());
+ contractedHeader.setShowWorkBadgeAtEnd(false);
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
private boolean shouldContractedBeFixedSize() {
return mBeforeN && mContractedWrapper instanceof NotificationCustomViewWrapper;
}
@@ -460,16 +502,16 @@
if (mDark == dark || mContractedChild == null) return;
mDark = dark;
dark = dark && !mShowingLegacyBackground;
- if (mVisibleType == VISIBLE_TYPE_CONTRACTED) {
+ if (mVisibleType == VISIBLE_TYPE_CONTRACTED || !dark) {
mContractedWrapper.setDark(dark, fade, delay);
}
- if (mVisibleType == VISIBLE_TYPE_EXPANDED) {
+ if (mVisibleType == VISIBLE_TYPE_EXPANDED || (mExpandedChild != null && !dark)) {
mExpandedWrapper.setDark(dark, fade, delay);
}
- if (mVisibleType == VISIBLE_TYPE_HEADSUP) {
+ if (mVisibleType == VISIBLE_TYPE_HEADSUP || (mHeadsUpChild != null && !dark)) {
mHeadsUpWrapper.setDark(dark, fade, delay);
}
- if (mSingleLineView != null && mVisibleType == VISIBLE_TYPE_SINGLELINE) {
+ if (mSingleLineView != null && (mVisibleType == VISIBLE_TYPE_SINGLELINE || !dark)) {
mSingleLineView.setDark(dark, fade, delay);
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StackScrollerDecorView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StackScrollerDecorView.java
index c836637..0a7ee51 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StackScrollerDecorView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StackScrollerDecorView.java
@@ -21,6 +21,8 @@
import android.view.View;
import android.view.animation.Interpolator;
+import com.android.systemui.Interpolators;
+
/**
* A common base class for all views in the notification stack scroller which don't have a
* background.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
index 5a7cf86..e4accf5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
@@ -24,15 +24,14 @@
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
-import android.graphics.drawable.ScaleDrawable;
import android.os.UserHandle;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.Log;
import android.util.TypedValue;
-import android.view.Gravity;
import android.view.ViewDebug;
import android.view.accessibility.AccessibilityEvent;
+
import com.android.internal.statusbar.StatusBarIcon;
import com.android.systemui.R;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarController.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarController.java
index bed64a3..a58fa86 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarController.java
@@ -25,11 +25,13 @@
import android.support.v4.util.SimpleArrayMap;
import android.view.View;
import android.widget.LinearLayout;
+
import com.android.systemui.R;
import com.android.systemui.statusbar.phone.ActivityStarter;
import java.net.URISyntaxException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -62,8 +64,8 @@
private SimpleArrayMap<String, Integer> mFacetPackageMap
= new SimpleArrayMap<String, Integer>();
- private List<Intent> mIntents = new ArrayList<Intent>();
- private List<Intent> mLongPressIntents = new ArrayList<Intent>();
+ private List<Intent> mIntents;
+ private List<Intent> mLongPressIntents;
private List<CarNavigationButton> mNavButtons = new ArrayList<CarNavigationButton>();
@@ -112,16 +114,19 @@
throw new RuntimeException("car_facet array lengths do not match");
}
+ mIntents = createEmptyIntentList(icons.length());
+ mLongPressIntents = createEmptyIntentList(icons.length());
+
for (int i = 0; i < icons.length(); i++) {
Drawable icon = icons.getDrawable(i);
try {
- mIntents.add(i,
+ mIntents.set(i,
Intent.parseUri(intents.getString(i), Intent.URI_INTENT_SCHEME));
String longpressUri = longpressIntents.getString(i);
boolean hasLongpress = !longpressUri.isEmpty();
if (hasLongpress) {
- mLongPressIntents.add(i,
+ mLongPressIntents.set(i,
Intent.parseUri(longpressUri, Intent.URI_INTENT_SCHEME));
}
@@ -299,4 +304,8 @@
setCurrentFacet(index);
startActivity(mLongPressIntents.get(index));
}
+
+ private List<Intent> createEmptyIntentList(int size) {
+ return Arrays.asList(new Intent[size]);
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarView.java
index efc3646..d530759 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarView.java
@@ -17,20 +17,13 @@
package com.android.systemui.statusbar.car;
import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.R.color;
import android.util.AttributeSet;
import android.view.View;
-import android.widget.ImageButton;
-import android.widget.ImageView.ScaleType;
import android.widget.LinearLayout;
import com.android.systemui.R;
import com.android.systemui.statusbar.phone.NavigationBarView;
-import java.util.ArrayList;
-import java.util.HashMap;
-
/**
* A custom navigation bar for the automotive use case.
* <p>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationButton.java
index 504f059..59e4244 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationButton.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationButton.java
@@ -19,6 +19,7 @@
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.widget.RelativeLayout;
+
import com.android.keyguard.AlphaOptimizedImageButton;
import com.android.systemui.R;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java
index 3025092..8e6c153 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java
@@ -16,8 +16,6 @@
package com.android.systemui.statusbar.car;
-import android.content.Context;
-import android.provider.Settings;
import android.view.View;
import android.view.ViewStub;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HeaderTransformState.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HeaderTransformState.java
index bf291d3..81483c6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HeaderTransformState.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HeaderTransformState.java
@@ -30,6 +30,8 @@
private static Pools.SimplePool<HeaderTransformState> sInstancePool
= new Pools.SimplePool<>(40);
private View mExpandButton;
+ private View mWorkProfileIcon;
+ private TransformState mWorkProfileState;
@Override
public void initFrom(View view) {
@@ -37,13 +39,16 @@
if (view instanceof NotificationHeaderView) {
NotificationHeaderView header = (NotificationHeaderView) view;
mExpandButton = header.getExpandButton();
+ mWorkProfileState = TransformState.obtain();
+ mWorkProfileIcon = header.getWorkProfileIcon();
+ mWorkProfileState.initFrom(mWorkProfileIcon);
}
}
@Override
public boolean transformViewTo(TransformState otherState, Runnable endRunnable) {
// if the transforming notification has a header, we have ensured that it looks the same
- // but the expand button, so lets fade just that one.
+ // but the expand button, so lets fade just that one and transform the work profile icon.
if (!(mTransformedView instanceof NotificationHeaderView)) {
return false;
}
@@ -66,7 +71,7 @@
@Override
public void transformViewFrom(TransformState otherState) {
// if the transforming notification has a header, we have ensured that it looks the same
- // but the expand button, so lets fade just that one.
+ // but the expand button, so lets fade just that one and transform the work profile icon.
if (!(mTransformedView instanceof NotificationHeaderView)) {
return;
}
@@ -79,10 +84,14 @@
if (headerChild.getVisibility() == View.GONE) {
continue;
}
- if (headerChild != mExpandButton) {
- headerChild.setVisibility(View.VISIBLE);
- } else {
+ if (headerChild == mExpandButton) {
CrossFadeHelper.fadeIn(mExpandButton);
+ } else {
+ headerChild.setVisibility(View.VISIBLE);
+ if (headerChild == mWorkProfileIcon) {
+ mWorkProfileState.animateViewFrom(
+ ((HeaderTransformState) otherState).mWorkProfileState);
+ }
}
}
return;
@@ -99,6 +108,9 @@
@Override
public void recycle() {
super.recycle();
+ if (mWorkProfileState != null) {
+ mWorkProfileState.recycle();
+ }
sInstancePool.release(this);
}
@@ -106,6 +118,7 @@
protected void reset() {
super.reset();
mExpandButton = null;
+ mWorkProfileState = null;
}
public void setVisible(boolean visible) {
@@ -125,6 +138,10 @@
if (headerChild == mExpandButton) {
headerChild.setAlpha(visible ? 1.0f : 0.0f);
}
+ if (headerChild == mWorkProfileIcon) {
+ headerChild.setTranslationX(0);
+ headerChild.setTranslationY(0);
+ }
}
}
@@ -144,6 +161,10 @@
headerChild.animate().cancel();
headerChild.setVisibility(View.VISIBLE);
headerChild.setAlpha(1.0f);
+ if (headerChild == mWorkProfileIcon) {
+ headerChild.setTranslationX(0);
+ headerChild.setTranslationY(0);
+ }
}
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationView.java
index 5eed5ed..ec73935 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationView.java
@@ -19,7 +19,6 @@
import android.annotation.Nullable;
import android.content.Context;
import android.text.TextUtils;
-import android.util.ArrayMap;
import android.util.AttributeSet;
import android.view.View;
import android.widget.TextView;
@@ -32,8 +31,6 @@
import com.android.systemui.statusbar.ViewTransformationHelper;
import com.android.systemui.statusbar.phone.NotificationPanelView;
-import java.util.ArrayList;
-
/**
* A hybrid view which may contain information about one ore more notifications.
*/
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationBigPictureTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationBigPictureTemplateViewWrapper.java
index ce9540b..c561601 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationBigPictureTemplateViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationBigPictureTemplateViewWrapper.java
@@ -20,7 +20,6 @@
import android.content.Context;
import android.graphics.drawable.Icon;
import android.os.Bundle;
-import android.os.Parcelable;
import android.service.notification.StatusBarNotification;
import android.view.View;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationCustomViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationCustomViewWrapper.java
index 97bf4b4..60c1911 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationCustomViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationCustomViewWrapper.java
@@ -35,6 +35,10 @@
@Override
public void setDark(boolean dark, boolean fade, long delay) {
+ if (dark == mDark) {
+ return;
+ }
+ super.setDark(dark, fade, delay);
if (fade) {
mInvertHelper.fade(dark, delay);
} else {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java
index f43a5d0..5a71caf 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java
@@ -28,22 +28,18 @@
import android.graphics.PorterDuffColorFilter;
import android.graphics.drawable.Drawable;
import android.service.notification.StatusBarNotification;
-import android.util.ArrayMap;
import android.view.NotificationHeaderView;
import android.view.View;
import android.view.ViewGroup;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
import android.widget.ImageView;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.ViewInvertHelper;
-import com.android.systemui.statusbar.Interpolators;
import com.android.systemui.statusbar.TransformableView;
import com.android.systemui.statusbar.ViewTransformationHelper;
import com.android.systemui.statusbar.phone.NotificationPanelView;
-import java.util.Collection;
import java.util.Stack;
/**
@@ -95,6 +91,7 @@
@Override
public void notifyContentUpdated(StatusBarNotification notification) {
+ super.notifyContentUpdated(notification);
// Reinspect the notification.
resolveHeaderViews();
updateInvertHelper();
@@ -150,6 +147,10 @@
@Override
public void setDark(boolean dark, boolean fade, long delay) {
+ if (dark == mDark) {
+ return;
+ }
+ super.setDark(dark, fade, delay);
if (fade) {
mInvertHelper.fade(dark, delay);
} else {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java
index 3475d13..b060245 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java
@@ -25,8 +25,8 @@
import android.widget.ProgressBar;
import android.widget.TextView;
+import com.android.systemui.Interpolators;
import com.android.systemui.statusbar.CrossFadeHelper;
-import com.android.systemui.statusbar.Interpolators;
import com.android.systemui.statusbar.TransformableView;
import com.android.systemui.statusbar.ViewTransformationHelper;
import com.android.systemui.statusbar.stack.StackStateAnimator;
@@ -172,6 +172,9 @@
@Override
public void setDark(boolean dark, boolean fade, long delay) {
+ if (dark == mDark) {
+ return;
+ }
super.setDark(dark, fade, delay);
setPictureGrayscale(dark, fade, delay);
setProgressBarDark(dark, fade, delay);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationUtils.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationUtils.java
index c931800..7089b78 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationUtils.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationUtils.java
@@ -16,12 +16,10 @@
package com.android.systemui.statusbar.notification;
-import android.view.View;
import android.widget.ImageView;
import com.android.internal.util.NotificationColorUtil;
import com.android.systemui.R;
-import com.android.systemui.statusbar.StatusBarIconView;
/**
* A util class for various reusable functions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationViewWrapper.java
index a1cf07e..f50b976 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationViewWrapper.java
@@ -31,6 +31,7 @@
public abstract class NotificationViewWrapper implements TransformableView {
protected final View mView;
+ protected boolean mDark;
public static NotificationViewWrapper wrap(Context ctx, View v) {
if (v.getId() == com.android.internal.R.id.status_bar_latest_event_content) {
@@ -56,13 +57,17 @@
* @param fade whether to animate the transition if the mode changes
* @param delay if fading, the delay of the animation
*/
- public abstract void setDark(boolean dark, boolean fade, long delay);
+ public void setDark(boolean dark, boolean fade, long delay) {
+ mDark = dark;
+ }
/**
* Notifies this wrapper that the content of the view might have changed.
* @param notification
*/
- public void notifyContentUpdated(StatusBarNotification notification) {};
+ public void notifyContentUpdated(StatusBarNotification notification) {
+ mDark = false;
+ };
/**
* Update the appearance of the expand button.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/TransformState.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/TransformState.java
index 3e1c40a..5832d86 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/TransformState.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/TransformState.java
@@ -26,10 +26,10 @@
import android.widget.ProgressBar;
import android.widget.TextView;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.statusbar.CrossFadeHelper;
import com.android.systemui.statusbar.ExpandableNotificationRow;
-import com.android.systemui.statusbar.Interpolators;
import com.android.systemui.statusbar.stack.StackStateAnimator;
/**
@@ -286,6 +286,9 @@
}
public void setVisible(boolean visible) {
+ if (mTransformedView.getVisibility() == View.GONE) {
+ return;
+ }
mTransformedView.animate().cancel();
mTransformedView.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);
mTransformedView.setAlpha(visible ? 1.0f : 0.0f);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java
index 37e5558..5796edb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java
@@ -16,7 +16,6 @@
package com.android.systemui.statusbar.phone;
-import android.animation.TimeInterpolator;
import android.app.ActivityManager;
import android.content.Context;
import android.content.res.Resources;
@@ -29,10 +28,9 @@
import android.os.SystemClock;
import android.util.Log;
import android.view.View;
-import android.view.animation.LinearInterpolator;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
-import com.android.systemui.statusbar.Interpolators;
public class BarTransitions {
private static final boolean DEBUG = false;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BaseStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BaseStatusBarHeader.java
index 497f044..9a94d34 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BaseStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BaseStatusBarHeader.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.util.AttributeSet;
import android.widget.RelativeLayout;
+
import com.android.systemui.qs.QSPanel;
import com.android.systemui.statusbar.policy.BatteryController;
import com.android.systemui.statusbar.policy.NetworkControllerImpl;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java
index aea9e1e..30d24ff 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java
@@ -14,12 +14,12 @@
package com.android.systemui.statusbar.phone;
-import com.android.systemui.statusbar.policy.KeyButtonView;
-
import android.graphics.drawable.Drawable;
import android.view.View;
import android.widget.ImageView;
+import com.android.systemui.statusbar.policy.KeyButtonView;
+
import java.util.ArrayList;
/**
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java
index b5dba18..7d4515e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java
@@ -25,9 +25,9 @@
import android.util.Log;
import android.view.animation.Interpolator;
+import com.android.systemui.Interpolators;
import com.android.systemui.doze.DozeHost;
import com.android.systemui.doze.DozeLog;
-import com.android.systemui.statusbar.Interpolators;
/**
* Controller which handles all the doze animations of the scrims.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java
index 7135836..1c9d937 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java
@@ -190,7 +190,8 @@
FINGERPRINT_COLLAPSE_SPEEDUP_FACTOR);
break;
case MODE_WAKE_AND_UNLOCK_PULSING:
- mPhoneStatusBar.updateMediaMetaData(false /* metaDataChanged */);
+ mPhoneStatusBar.updateMediaMetaData(false /* metaDataChanged */,
+ true /* allowEnterAnimation */);
// Fall through.
case MODE_WAKE_AND_UNLOCK:
mStatusBarWindowManager.setStatusBarFocusable(false);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java
index e7064e5..b5b7f43 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java
@@ -21,7 +21,6 @@
import android.view.ViewConfiguration;
import com.android.systemui.Gefingerpoken;
-import com.android.systemui.R;
import com.android.systemui.statusbar.ExpandableNotificationRow;
import com.android.systemui.statusbar.ExpandableView;
import com.android.systemui.statusbar.policy.HeadsUpManager;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java
index c220efe..915b565 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java
@@ -25,10 +25,10 @@
import android.view.View;
import android.view.ViewConfiguration;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.classifier.FalsingManager;
import com.android.systemui.statusbar.FlingAnimationUtils;
-import com.android.systemui.statusbar.Interpolators;
import com.android.systemui.statusbar.KeyguardAffordanceView;
/**
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
index 94d3829..83a15ad 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
@@ -45,8 +45,6 @@
import android.view.View;
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityNodeInfo;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
import android.widget.FrameLayout;
import android.widget.TextView;
@@ -55,10 +53,10 @@
import com.android.keyguard.KeyguardUpdateMonitorCallback;
import com.android.systemui.EventLogConstants;
import com.android.systemui.EventLogTags;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.assist.AssistManager;
import com.android.systemui.statusbar.CommandQueue;
-import com.android.systemui.statusbar.Interpolators;
import com.android.systemui.statusbar.KeyguardAffordanceView;
import com.android.systemui.statusbar.KeyguardIndicationController;
import com.android.systemui.statusbar.policy.AccessibilityController;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
index 347ba3d..b9e1ad2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
@@ -21,6 +21,7 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
import android.view.accessibility.AccessibilityEvent;
import com.android.internal.widget.LockPatternUtils;
@@ -99,7 +100,20 @@
mRoot.setVisibility(View.VISIBLE);
mKeyguardView.onResume();
showPromptReason(mBouncerPromptReason);
- mKeyguardView.startAppearAnimation();
+ if (mKeyguardView.getHeight() != 0) {
+ mKeyguardView.startAppearAnimation();
+ } else {
+ mKeyguardView.getViewTreeObserver().addOnPreDrawListener(
+ new ViewTreeObserver.OnPreDrawListener() {
+ @Override
+ public boolean onPreDraw() {
+ mKeyguardView.getViewTreeObserver().removeOnPreDrawListener(this);
+ mKeyguardView.startAppearAnimation();
+ return true;
+ }
+ });
+ mKeyguardView.requestLayout();
+ }
mShowingSoon = false;
mKeyguardView.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
index e67aa84..7fbb176 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
@@ -28,8 +28,8 @@
import android.widget.TextView;
import com.android.systemui.BatteryMeterView;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
-import com.android.systemui.statusbar.Interpolators;
import com.android.systemui.statusbar.policy.BatteryController;
import com.android.systemui.statusbar.policy.KeyguardUserSwitcher;
import com.android.systemui.statusbar.policy.UserInfoController;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
index 8717a15..03dd25e3c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
@@ -66,6 +66,9 @@
}
public boolean hasMultipleUsers() {
+ if (mUserListener == null) {
+ return false;
+ }
return mUserListener.getCount() != 0;
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java
index 786e64d..a2586f1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java
@@ -28,13 +28,15 @@
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.internal.policy.DividerSnapAlgorithm.SnapTarget;
import com.android.systemui.R;
import com.android.systemui.RecentsComponent;
import com.android.systemui.stackdivider.Divider;
-import com.android.internal.policy.DividerSnapAlgorithm.SnapTarget;
import com.android.systemui.tuner.TunerService;
-import static android.view.WindowManager.*;
+import static android.view.WindowManager.DOCKED_INVALID;
+import static android.view.WindowManager.DOCKED_LEFT;
+import static android.view.WindowManager.DOCKED_TOP;
/**
* Class to detect gestures on the navigation bar.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java
index 6cfd715..9359301 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java
@@ -18,10 +18,7 @@
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
-import android.graphics.drawable.Icon;
-import android.net.Uri;
import android.util.AttributeSet;
-import android.util.Log;
import android.util.SparseArray;
import android.view.LayoutInflater;
import android.view.View;
@@ -30,11 +27,11 @@
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.Space;
+
import com.android.systemui.R;
import com.android.systemui.statusbar.policy.KeyButtonView;
import com.android.systemui.tuner.TunerService;
-import java.io.File;
import java.util.Objects;
public class NavigationBarInflaterView extends FrameLayout implements TunerService.Tunable {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
index d86629f..5f5974e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -21,7 +21,6 @@
import android.animation.ObjectAnimator;
import android.animation.TimeInterpolator;
import android.animation.ValueAnimator;
-import android.annotation.Nullable;
import android.app.ActivityManagerNative;
import android.app.StatusBarManager;
import android.content.Context;
@@ -47,6 +46,7 @@
import android.view.WindowManagerGlobal;
import android.view.inputmethod.InputMethodManager;
import android.widget.LinearLayout;
+
import com.android.systemui.R;
import com.android.systemui.RecentsComponent;
import com.android.systemui.stackdivider.Divider;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
index 405ef05..03a597c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
@@ -8,6 +8,7 @@
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
+
import com.android.internal.util.NotificationColorUtil;
import com.android.systemui.R;
import com.android.systemui.statusbar.NotificationData;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index 8e89efd..277668f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -49,6 +49,7 @@
import com.android.systemui.DejankUtils;
import com.android.systemui.EventLogConstants;
import com.android.systemui.EventLogTags;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.classifier.FalsingManager;
import com.android.systemui.qs.QSContainer;
@@ -57,7 +58,6 @@
import com.android.systemui.statusbar.ExpandableView;
import com.android.systemui.statusbar.FlingAnimationUtils;
import com.android.systemui.statusbar.GestureRecorder;
-import com.android.systemui.statusbar.Interpolators;
import com.android.systemui.statusbar.KeyguardAffordanceView;
import com.android.systemui.statusbar.NotificationData;
import com.android.systemui.statusbar.StatusBarState;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
index f036d04..c9bb15d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -34,11 +34,11 @@
import com.android.systemui.EventLogConstants;
import com.android.systemui.EventLogTags;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.classifier.FalsingManager;
import com.android.systemui.doze.DozeLog;
import com.android.systemui.statusbar.FlingAnimationUtils;
-import com.android.systemui.statusbar.Interpolators;
import com.android.systemui.statusbar.StatusBarState;
import com.android.systemui.statusbar.policy.HeadsUpManager;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index f2dea3c..7e7a948 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -26,6 +26,7 @@
import android.app.Notification;
import android.app.PendingIntent;
import android.app.StatusBarManager;
+import android.app.WallpaperManager;
import android.content.BroadcastReceiver;
import android.content.ComponentCallbacks2;
import android.content.Context;
@@ -66,6 +67,7 @@
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemClock;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.Vibrator;
@@ -105,6 +107,7 @@
import com.android.systemui.DemoMode;
import com.android.systemui.EventLogConstants;
import com.android.systemui.EventLogTags;
+import com.android.systemui.Interpolators;
import com.android.systemui.Prefs;
import com.android.systemui.R;
import com.android.systemui.assist.AssistManager;
@@ -114,8 +117,6 @@
import com.android.systemui.keyguard.KeyguardViewMediator;
import com.android.systemui.qs.QSPanel;
import com.android.systemui.recents.ScreenPinningRequest;
-import com.android.systemui.recents.events.EventBus;
-import com.android.systemui.recents.events.activity.DockingTopTaskEvent;
import com.android.systemui.stackdivider.Divider;
import com.android.systemui.statusbar.ActivatableNotificationView;
import com.android.systemui.statusbar.BackDropView;
@@ -126,7 +127,6 @@
import com.android.systemui.statusbar.EmptyShadeView;
import com.android.systemui.statusbar.ExpandableNotificationRow;
import com.android.systemui.statusbar.GestureRecorder;
-import com.android.systemui.statusbar.Interpolators;
import com.android.systemui.statusbar.KeyguardIndicationController;
import com.android.systemui.statusbar.NotificationData;
import com.android.systemui.statusbar.NotificationData.Entry;
@@ -244,6 +244,11 @@
* Prudently disable QS and notifications. */
private static final boolean ONLY_CORE_APPS;
+ /** If true, the lockscreen will show a distinct wallpaper */
+ private static final boolean ENABLE_LOCKSCREEN_WALLPAPER =
+ !ActivityManager.isLowRamDeviceStatic()
+ && SystemProperties.getBoolean("debug.lockscreen_wallpaper", false);
+
/* If true, the device supports freeform window management.
* This affects the status bar UI. */
private static final boolean FREEFORM_WINDOW_MANAGEMENT;
@@ -461,7 +466,7 @@
if (state != null) {
if (!isPlaybackActive(state.getState())) {
clearCurrentMediaNotification();
- updateMediaMetaData(true);
+ updateMediaMetaData(true, true);
}
}
}
@@ -471,7 +476,7 @@
super.onMetadataChanged(metadata);
if (DEBUG_MEDIA) Log.v(TAG, "DEBUG_MEDIA: onMetadataChanged: " + metadata);
mMediaMetadata = metadata;
- updateMediaMetaData(true);
+ updateMediaMetaData(true, true);
}
};
@@ -1315,7 +1320,7 @@
}
if (key.equals(mMediaNotificationKey)) {
clearCurrentMediaNotification();
- updateMediaMetaData(true);
+ updateMediaMetaData(true, true);
}
if (deferRemoval) {
mLatestRankingMap = ranking;
@@ -1373,6 +1378,9 @@
boolean sensitivePackage = packageHasVisibilityOverride(ent.notification.getKey());
boolean sensitive = (sensitiveNote && hideSensitive) || sensitivePackage;
boolean showingPublic = sensitive && isLockscreenPublicMode();
+ if (showingPublic) {
+ updatePublicContentView(ent, ent.notification);
+ }
ent.row.setSensitive(sensitive);
if (ent.autoRedacted && ent.legacy) {
// TODO: Also fade this? Or, maybe easier (and better), provide a dark redacted form
@@ -1703,7 +1711,7 @@
if (metaDataChanged) {
updateNotifications();
}
- updateMediaMetaData(metaDataChanged);
+ updateMediaMetaData(metaDataChanged, true);
}
private int getMediaControllerPlaybackState(MediaController controller) {
@@ -1762,7 +1770,7 @@
/**
* Refresh or remove lockscreen artwork from media metadata.
*/
- public void updateMediaMetaData(boolean metaDataChanged) {
+ public void updateMediaMetaData(boolean metaDataChanged, boolean allowEnterAnimation) {
if (!SHOW_LOCKSCREEN_MEDIA_ARTWORK) return;
if (mBackdrop == null) return; // called too early
@@ -1787,6 +1795,12 @@
// might still be null
}
}
+ if (ENABLE_LOCKSCREEN_WALLPAPER && artworkBitmap == null) {
+ // TODO: use real lockscreen wallpaper.
+ WallpaperManager wallpaperManager = mContext
+ .getSystemService(WallpaperManager.class);
+ artworkBitmap = wallpaperManager.getBitmap();
+ }
final boolean hasArtwork = artworkBitmap != null;
@@ -1796,7 +1810,12 @@
// time to show some art!
if (mBackdrop.getVisibility() != View.VISIBLE) {
mBackdrop.setVisibility(View.VISIBLE);
- mBackdrop.animate().alpha(1f);
+ if (allowEnterAnimation) {
+ mBackdrop.animate().alpha(1f);
+ } else {
+ mBackdrop.animate().cancel();
+ mBackdrop.setAlpha(1f);
+ }
metaDataChanged = true;
if (DEBUG_MEDIA) {
Log.v(TAG, "DEBUG_MEDIA: Fading in album artwork");
@@ -3020,6 +3039,10 @@
else if (Intent.ACTION_SCREEN_ON.equals(action)) {
notifyNavigationBarScreenOn(true);
}
+ else if (ENABLE_LOCKSCREEN_WALLPAPER
+ && Intent.ACTION_WALLPAPER_CHANGED.equals(action)) {
+ updateMediaMetaData(true, true);
+ }
}
};
@@ -3041,7 +3064,7 @@
}
} else if (ACTION_FAKE_ARTWORK.equals(action)) {
if (DEBUG_MEDIA_FAKE_ARTWORK) {
- updateMediaMetaData(true);
+ updateMediaMetaData(true, true);
}
}
}
@@ -3105,7 +3128,7 @@
resetUserSetupObserver();
setControllerUsers();
clearCurrentMediaNotification();
- updateMediaMetaData(true);
+ updateMediaMetaData(true, false);
}
private void setControllerUsers() {
@@ -3524,7 +3547,7 @@
runLaunchTransitionEndRunnable();
mLaunchTransitionFadingAway = false;
mScrimController.forceHideScrims(false /* hide */);
- updateMediaMetaData(true /* metaDataChanged */);
+ updateMediaMetaData(true /* metaDataChanged */, true);
}
public boolean isCollapsing() {
@@ -3559,7 +3582,7 @@
beforeFading.run();
}
mScrimController.forceHideScrims(true /* hide */);
- updateMediaMetaData(false);
+ updateMediaMetaData(false, true);
mNotificationPanel.setAlpha(1);
mNotificationPanel.animate()
.alpha(0)
@@ -3761,7 +3784,7 @@
updateStackScrollerState(goingToFullShade, fromShadeLocked);
updateNotifications();
checkBarModes();
- updateMediaMetaData(false);
+ updateMediaMetaData(false, mState != StatusBarState.KEYGUARD);
mKeyguardMonitor.notifyKeyguardState(mStatusBarKeyguardViewManager.isShowing(),
mStatusBarKeyguardViewManager.isSecure());
}
@@ -4241,6 +4264,11 @@
}
}
+ @Override
+ public void requestTvPictureInPicture() {
+ // no-op.
+ }
+
public void notifyFpAuthModeChanged() {
updateDozing();
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
index 37d61b9..df5a622 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
@@ -34,6 +34,7 @@
import android.provider.Settings.Global;
import android.telecom.TelecomManager;
import android.util.Log;
+
import com.android.internal.telephony.IccCardConstants;
import com.android.internal.telephony.TelephonyIntents;
import com.android.systemui.R;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
index b8cd7fb..8e2d828 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
@@ -28,6 +28,7 @@
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
+
import com.android.systemui.R;
import com.android.systemui.qs.QSTile;
import com.android.systemui.qs.external.CustomTile;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
index f18c341..9aeb1f8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
@@ -31,6 +31,7 @@
import android.widget.Switch;
import android.widget.TextView;
import android.widget.Toast;
+
import com.android.keyguard.KeyguardStatusView;
import com.android.systemui.R;
import com.android.systemui.qs.QSPanel;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsButton.java
index 7247b57..6220fcb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsButton.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsButton.java
@@ -28,7 +28,7 @@
import android.view.animation.AnimationUtils;
import com.android.keyguard.AlphaOptimizedImageButton;
-import com.android.systemui.statusbar.Interpolators;
+import com.android.systemui.Interpolators;
public class SettingsButton extends AlphaOptimizedImageButton {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java
index c6537e8..9996b75 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java
@@ -39,8 +39,8 @@
import com.android.internal.statusbar.StatusBarIcon;
import com.android.systemui.BatteryMeterView;
import com.android.systemui.FontSizeUtils;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
-import com.android.systemui.statusbar.Interpolators;
import com.android.systemui.statusbar.NotificationData;
import com.android.systemui.statusbar.SignalClusterView;
import com.android.systemui.statusbar.StatusBarIconView;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java
index 382de19..fcaf050 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java
@@ -24,7 +24,6 @@
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
-import android.view.Window;
import android.view.WindowManager;
import com.android.keyguard.R;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
index 35a17e4..eb5b57e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
@@ -30,7 +30,6 @@
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
-import android.view.ViewRootImpl;
import android.view.WindowManager;
import android.view.WindowManagerGlobal;
import android.widget.FrameLayout;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java
index 116237d..0442ac3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java
@@ -16,12 +16,12 @@
package com.android.systemui.statusbar.phone;
-import com.android.systemui.R;
-
import android.app.AlertDialog;
import android.content.Context;
import android.view.WindowManager;
+import com.android.systemui.R;
+
/**
* Base class for dialogs that should appear over panels and keyguard.
*/
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/TrustDrawable.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/TrustDrawable.java
index 1aae496..d5a91bb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/TrustDrawable.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/TrustDrawable.java
@@ -31,8 +31,8 @@
import android.graphics.drawable.Drawable;
import android.view.animation.Interpolator;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
-import com.android.systemui.statusbar.Interpolators;
public class TrustDrawable extends Drawable {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java
index fd3c96e..093a827 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java
@@ -16,23 +16,22 @@
package com.android.systemui.statusbar.phone;
-import com.android.systemui.R;
-
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.BitmapShader;
import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
import android.graphics.Matrix;
import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
import android.graphics.Shader;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.View;
+import com.android.systemui.R;
+
/**
* A view that displays a user image cropped to a circle with a frame.
*/
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java
index 8fa9c7e..e7e2ac2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java
@@ -33,6 +33,7 @@
Collection<CachedBluetoothDevice> getDevices();
void connect(CachedBluetoothDevice device);
void disconnect(CachedBluetoothDevice device);
+ boolean canConfigBluetooth();
public interface Callback {
void onBluetoothStateChange(boolean enabled);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
index a04edf7..6439bea 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
@@ -16,11 +16,14 @@
package com.android.systemui.statusbar.policy;
+import android.app.ActivityManager;
import android.bluetooth.BluetoothAdapter;
import android.content.Context;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
+import android.os.UserHandle;
+import android.os.UserManager;
import android.util.Log;
import com.android.settingslib.bluetooth.BluetoothCallback;
@@ -39,6 +42,8 @@
private final ArrayList<Callback> mCallbacks = new ArrayList<Callback>();
private final LocalBluetoothManager mLocalBluetoothManager;
+ private final UserManager mUserManager;
+ private final int mCurrentUser;
private boolean mEnabled;
private int mConnectionState = BluetoothAdapter.STATE_DISCONNECTED;
@@ -54,6 +59,14 @@
onBluetoothStateChanged(
mLocalBluetoothManager.getBluetoothAdapter().getBluetoothState());
}
+ mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+ mCurrentUser = ActivityManager.getCurrentUser();
+ }
+
+ @Override
+ public boolean canConfigBluetooth() {
+ return !mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_BLUETOOTH,
+ UserHandle.of(mCurrentUser));
}
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java
index 59d54ff..3bd68a9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java
@@ -20,8 +20,8 @@
import android.view.ViewPropertyAnimator;
import android.widget.FrameLayout;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
-import com.android.systemui.statusbar.Interpolators;
import com.android.systemui.statusbar.ScrimView;
import com.android.systemui.statusbar.phone.StatusBarWindowView;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java
index e344954..b89a77b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java
@@ -16,8 +16,6 @@
package com.android.systemui.statusbar.policy;
-import static android.media.MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY;
-
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
@@ -41,6 +39,8 @@
import java.util.Set;
import java.util.UUID;
+import static android.media.MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY;
+
/** Platform implementation of the cast controller. **/
public class CastControllerImpl implements CastController {
private static final String TAG = "CastController";
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
index 7054bb8..3293964 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
@@ -16,6 +16,8 @@
package com.android.systemui.statusbar.policy;
+import libcore.icu.LocaleData;
+
import android.app.ActivityManager;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -36,12 +38,12 @@
import android.view.Display;
import android.view.View;
import android.widget.TextView;
+
import com.android.systemui.DemoMode;
import com.android.systemui.R;
import com.android.systemui.statusbar.phone.StatusBarIconController;
import com.android.systemui.tuner.TunerService;
import com.android.systemui.tuner.TunerService.Tunable;
-import libcore.icu.LocaleData;
import java.text.SimpleDateFormat;
import java.util.Calendar;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DisplayController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DisplayController.java
index e5d244f..d47050c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DisplayController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DisplayController.java
@@ -14,15 +14,17 @@
package com.android.systemui.statusbar.policy;
+import libcore.util.Objects;
+
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.res.Configuration;
import android.provider.Settings;
+
import com.android.systemui.R;
import com.android.systemui.tuner.TunerService;
-import libcore.util.Objects;
import java.util.ArrayList;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotController.java
index 7ca91a5..b036936 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotController.java
@@ -22,6 +22,7 @@
boolean isHotspotEnabled();
boolean isHotspotSupported();
void setHotspotEnabled(boolean enabled);
+ boolean isTetheringAllowed();
public interface Callback {
void onHotspotChanged(boolean enabled);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java
index 5719f76..61d26c7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java
@@ -16,12 +16,15 @@
package com.android.systemui.statusbar.policy;
+import android.app.ActivityManager;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.net.ConnectivityManager;
import android.net.wifi.WifiManager;
+import android.os.UserHandle;
+import android.os.UserManager;
import android.util.Log;
import com.android.settingslib.TetherUtil;
@@ -39,13 +42,17 @@
private final Receiver mReceiver = new Receiver();
private final ConnectivityManager mConnectivityManager;
private final Context mContext;
+ private final UserManager mUserManager;
+ private final int mCurrentUser;
private int mHotspotState;
public HotspotControllerImpl(Context context) {
mContext = context;
- mConnectivityManager = (ConnectivityManager)context.getSystemService(
+ mConnectivityManager = (ConnectivityManager) context.getSystemService(
Context.CONNECTIVITY_SERVICE);
+ mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+ mCurrentUser = ActivityManager.getCurrentUser();
}
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
@@ -95,6 +102,12 @@
return TetherUtil.isTetheringSupported(mContext);
}
+ @Override
+ public boolean isTetheringAllowed() {
+ return !mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING,
+ UserHandle.of(mCurrentUser));
+ }
+
static final class OnStartTetheringCallback extends
ConnectivityManager.OnStartTetheringCallback {
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java
index d739d6c1..57e092a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java
@@ -31,8 +31,8 @@
import android.view.View;
import android.view.animation.Interpolator;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
-import com.android.systemui.statusbar.Interpolators;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
index 6e7cf19..c8c824a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
@@ -24,7 +24,6 @@
import android.graphics.drawable.Icon;
import android.hardware.input.InputManager;
import android.media.AudioManager;
-import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.SystemClock;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java
index cec0c0a..970fed0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java
@@ -20,6 +20,7 @@
import android.content.Context;
import android.os.RemoteException;
import android.view.WindowManagerGlobal;
+
import com.android.keyguard.KeyguardUpdateMonitor;
import com.android.keyguard.KeyguardUpdateMonitorCallback;
import com.android.systemui.settings.CurrentUserTracker;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java
index 0959b0c..867a8a3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java
@@ -21,20 +21,18 @@
import android.animation.ObjectAnimator;
import android.content.Context;
import android.database.DataSetObserver;
-import android.graphics.Interpolator;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewStub;
-import android.view.animation.AnimationUtils;
import android.widget.FrameLayout;
import com.android.settingslib.animation.AppearAnimationUtils;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.qs.tiles.UserDetailItemView;
-import com.android.systemui.statusbar.Interpolators;
import com.android.systemui.statusbar.phone.KeyguardStatusBarView;
import com.android.systemui.statusbar.phone.NotificationPanelView;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationController.java
index 29a8981..401943e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationController.java
@@ -21,6 +21,7 @@
boolean setLocationEnabled(boolean enabled);
void addSettingsChangedCallback(LocationSettingsChangeCallback cb);
void removeSettingsChangedCallback(LocationSettingsChangeCallback cb);
+ boolean isUserLocationRestricted();
/**
* A callback for change in location settings (the user has enabled/disabled location).
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java
index 7517f97..436a40d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java
@@ -52,6 +52,7 @@
private AppOpsManager mAppOpsManager;
private StatusBarManager mStatusBarManager;
+ private final int mCurrentUser;
private boolean mAreActiveLocationRequests;
@@ -73,6 +74,7 @@
mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
mStatusBarManager
= (StatusBarManager) context.getSystemService(Context.STATUS_BAR_SERVICE);
+ mCurrentUser = ActivityManager.getCurrentUser();
// Examine the current location state and initialize the status view.
updateActiveLocationRequests();
@@ -103,10 +105,6 @@
* @return true if attempt to change setting was successful.
*/
public boolean setLocationEnabled(boolean enabled) {
- int currentUserId = ActivityManager.getCurrentUser();
- if (isUserLocationRestricted(currentUserId)) {
- return false;
- }
final ContentResolver cr = mContext.getContentResolver();
// When enabling location, a user consent dialog will pop up, and the
// setting won't be fully enabled until the user accepts the agreement.
@@ -115,7 +113,7 @@
// QuickSettings always runs as the owner, so specifically set the settings
// for the current foreground user.
return Settings.Secure
- .putIntForUser(cr, Settings.Secure.LOCATION_MODE, mode, currentUserId);
+ .putIntForUser(cr, Settings.Secure.LOCATION_MODE, mode, mCurrentUser);
}
/**
@@ -133,11 +131,10 @@
/**
* Returns true if the current user is restricted from using location.
*/
- private boolean isUserLocationRestricted(int userId) {
+ public boolean isUserLocationRestricted() {
final UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
- return um.hasUserRestriction(
- UserManager.DISALLOW_SHARE_LOCATION,
- new UserHandle(userId));
+ return um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION,
+ UserHandle.of(mCurrentUser));
}
/**
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
index 755a5b3..93c7322 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.content.Intent;
import android.telephony.SubscriptionInfo;
+
import com.android.settingslib.net.DataUsageController;
import com.android.settingslib.wifi.AccessPoint;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
index 107a904..eecf8c2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
@@ -37,6 +37,7 @@
import android.text.TextUtils;
import android.util.Log;
import android.util.MathUtils;
+
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyIntents;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
index 61a9851..c6659d1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
@@ -16,12 +16,6 @@
package com.android.systemui.statusbar.policy;
-import com.android.systemui.R;
-import com.android.systemui.statusbar.NotificationData;
-import com.android.systemui.statusbar.RemoteInputController;
-
-import android.annotation.NonNull;
-import android.app.Notification;
import android.app.PendingIntent;
import android.app.RemoteInput;
import android.content.Context;
@@ -47,7 +41,9 @@
import android.widget.ProgressBar;
import android.widget.TextView;
-import java.util.ArrayList;
+import com.android.systemui.R;
+import com.android.systemui.statusbar.NotificationData;
+import com.android.systemui.statusbar.RemoteInputController;
/**
* Host for the remote input.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java
index 6ddd7a3..a85fe0d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java
@@ -25,21 +25,17 @@
import android.net.IConnectivityManager;
import android.net.Network;
import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
import android.net.NetworkRequest;
-import android.os.Process;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserHandle;
import android.os.UserManager;
-import android.text.TextUtils;
import android.util.Log;
import android.util.SparseArray;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig;
-import com.android.internal.net.VpnInfo;
import com.android.systemui.R;
import java.io.FileDescriptor;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java
index 5e9447e..c954d08 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java
@@ -15,8 +15,6 @@
*/
package com.android.systemui.statusbar.policy;
-import static com.android.systemui.statusbar.policy.NetworkControllerImpl.TAG;
-
import android.content.Context;
import android.text.format.DateFormat;
import android.util.Log;
@@ -24,6 +22,8 @@
import java.io.PrintWriter;
import java.util.BitSet;
+import static com.android.systemui.statusbar.policy.NetworkControllerImpl.TAG;
+
/**
* Common base class for handling signal for both wifi and mobile data.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoController.java
index 6931d1e..85ac755 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoController.java
@@ -36,9 +36,9 @@
import android.util.Log;
import android.util.Pair;
+import com.android.internal.util.UserIcons;
import com.android.systemui.BitmapHelper;
import com.android.systemui.R;
-import com.android.internal.util.UserIcons;
import java.util.ArrayList;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
index e4ded67..6ca7dc8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
@@ -22,9 +22,7 @@
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
-import android.app.admin.DevicePolicyManager;
import android.content.BroadcastReceiver;
-import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
@@ -34,8 +32,6 @@
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
-import android.os.Build;
-import android.os.Bundle;
import android.os.Handler;
import android.os.RemoteException;
import android.os.UserHandle;
@@ -44,7 +40,6 @@
import android.util.Log;
import android.util.SparseArray;
import android.util.SparseBooleanArray;
-import android.util.SparseIntArray;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
@@ -622,7 +617,7 @@
private void checkIfAddUserDisallowed(UserRecord record) {
EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
- UserManager.DISALLOW_ADD_USER, UserHandle.myUserId());
+ UserManager.DISALLOW_ADD_USER, ActivityManager.getCurrentUser());
if (admin != null) {
record.isDisabledByAdmin = true;
record.enforcedAdmin = admin;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java
index eab6e13..cc98eb6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java
@@ -23,6 +23,7 @@
import android.os.Message;
import android.os.Messenger;
import android.util.Log;
+
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.AsyncChannel;
import com.android.settingslib.wifi.WifiStatusTracker;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/AmbientState.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/AmbientState.java
index a3f571e..50e5b88 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/AmbientState.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/AmbientState.java
@@ -19,7 +19,6 @@
import android.view.View;
import com.android.systemui.statusbar.ActivatableNotificationView;
-import com.android.systemui.statusbar.ExpandableNotificationRow;
import com.android.systemui.statusbar.policy.HeadsUpManager;
import java.util.ArrayList;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
index 60dca99..d6276b8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@ -46,6 +46,7 @@
import android.widget.OverScroller;
import com.android.systemui.ExpandHelper;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.SwipeHelper;
import com.android.systemui.classifier.FalsingManager;
@@ -54,7 +55,6 @@
import com.android.systemui.statusbar.EmptyShadeView;
import com.android.systemui.statusbar.ExpandableNotificationRow;
import com.android.systemui.statusbar.ExpandableView;
-import com.android.systemui.statusbar.Interpolators;
import com.android.systemui.statusbar.NotificationOverflowContainer;
import com.android.systemui.statusbar.StackScrollerDecorView;
import com.android.systemui.statusbar.StatusBarState;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java
index e75e8e8..cf4802d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java
@@ -24,10 +24,10 @@
import android.view.View;
import android.view.animation.Interpolator;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.statusbar.ExpandableNotificationRow;
import com.android.systemui.statusbar.ExpandableView;
-import com.android.systemui.statusbar.Interpolators;
import com.android.systemui.statusbar.policy.HeadsUpManager;
import java.util.ArrayList;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackViewState.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackViewState.java
index 41824ea..05fa27d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackViewState.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackViewState.java
@@ -16,10 +16,6 @@
package com.android.systemui.statusbar.stack;
-import android.view.View;
-
-import com.android.systemui.statusbar.ExpandableView;
-
/**
* A state of an expandable view
*/
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java
index 0406ae3..f322348 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java
@@ -25,6 +25,7 @@
import com.android.systemui.statusbar.ActivatableNotificationView;
import com.android.systemui.statusbar.BaseStatusBar;
import com.android.systemui.statusbar.NotificationData;
+import com.android.systemui.tv.pip.PipManager;
/*
* Status bar implementation for "large screen" products that mostly present no on-screen nav
@@ -170,6 +171,11 @@
}
@Override
+ public void requestTvPictureInPicture() {
+ PipManager.getInstance().requestTvPictureInPicture();
+ }
+
+ @Override
protected void updateHeadsUp(String key, NotificationData.Entry entry, boolean shouldPeek,
boolean alertAgain) {
}
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/ClipboardView.java b/packages/SystemUI/src/com/android/systemui/tuner/ClipboardView.java
index 63ed912..919f150 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/ClipboardView.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/ClipboardView.java
@@ -14,8 +14,6 @@
package com.android.systemui.tuner;
-import com.android.systemui.R;
-
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.ClipboardManager.OnPrimaryClipChangedListener;
@@ -26,6 +24,8 @@
import android.view.View;
import android.widget.ImageView;
+import com.android.systemui.R;
+
public class ClipboardView extends ImageView implements OnPrimaryClipChangedListener {
private static final int TARGET_COLOR = 0x4dffffff;
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/ColorMatrixTile.java b/packages/SystemUI/src/com/android/systemui/tuner/ColorMatrixTile.java
index 1933c15..7b06393 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/ColorMatrixTile.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/ColorMatrixTile.java
@@ -17,6 +17,7 @@
import android.app.ActivityManager;
import android.provider.Settings;
+
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.systemui.R;
import com.android.systemui.qs.QSTile;
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/KeycodeSelectionHelper.java b/packages/SystemUI/src/com/android/systemui/tuner/KeycodeSelectionHelper.java
index e6073ae..096ecc0 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/KeycodeSelectionHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/KeycodeSelectionHelper.java
@@ -18,14 +18,13 @@
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
-import android.net.Uri;
-import android.util.Pair;
import android.view.KeyEvent;
+import com.android.systemui.R;
+
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
-import com.android.systemui.R;
public class KeycodeSelectionHelper {
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/NavBarTuner.java b/packages/SystemUI/src/com/android/systemui/tuner/NavBarTuner.java
index 6fba9dc..5ded885 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/NavBarTuner.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/NavBarTuner.java
@@ -14,8 +14,6 @@
package com.android.systemui.tuner;
-import com.android.systemui.R;
-
import android.annotation.Nullable;
import android.app.Activity;
import android.app.AlertDialog;
@@ -34,7 +32,6 @@
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.helper.ItemTouchHelper;
-import android.util.DisplayMetrics;
import android.util.TypedValue;
import android.view.Display;
import android.view.LayoutInflater;
@@ -49,26 +46,28 @@
import android.widget.SeekBar;
import android.widget.TextView;
+import com.android.systemui.R;
+
import java.util.ArrayList;
import java.util.List;
+import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.BACK;
+import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.BUTTON_SEPARATOR;
import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.CLIPBOARD;
+import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.GRAVITY_SEPARATOR;
+import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.HOME;
import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.KEY;
import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.KEY_CODE_END;
import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.KEY_CODE_START;
import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.KEY_IMAGE_DELIM;
-import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.SIZE_MOD_END;
-import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.SIZE_MOD_START;
-import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.extractButton;
-import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.extractSize;
-import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.BACK;
-import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.BUTTON_SEPARATOR;
-import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.GRAVITY_SEPARATOR;
-import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.HOME;
import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.MENU_IME;
import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.NAVSPACE;
import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.NAV_BAR_VIEWS;
import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.RECENT;
+import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.SIZE_MOD_END;
+import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.SIZE_MOD_START;
+import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.extractButton;
+import static com.android.systemui.statusbar.phone.NavigationBarInflaterView.extractSize;
public class NavBarTuner extends Fragment implements TunerService.Tunable {
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/PreviewNavInflater.java b/packages/SystemUI/src/com/android/systemui/tuner/PreviewNavInflater.java
index b30ca5c..e6e8f4e 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/PreviewNavInflater.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/PreviewNavInflater.java
@@ -14,12 +14,12 @@
package com.android.systemui.tuner;
-import com.android.systemui.statusbar.phone.NavigationBarInflaterView;
-
import android.content.Context;
import android.util.AttributeSet;
import android.view.MotionEvent;
+import com.android.systemui.statusbar.phone.NavigationBarInflaterView;
+
public class PreviewNavInflater extends NavigationBarInflaterView {
public PreviewNavInflater(Context context, AttributeSet attrs) {
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java
index e4d7be7..9df5368 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java
@@ -18,7 +18,6 @@
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
-import android.app.FragmentTransaction;
import android.content.DialogInterface;
import android.database.ContentObserver;
import android.net.Uri;
@@ -30,7 +29,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java
index abaa628..f298e16 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java
@@ -33,6 +33,7 @@
import android.provider.Settings;
import android.util.ArrayMap;
import android.util.ArraySet;
+
import com.android.systemui.BatteryMeterDrawable;
import com.android.systemui.DemoMode;
import com.android.systemui.R;
diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java
index e947ed5..6febe5f 100644
--- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java
+++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java
@@ -16,6 +16,7 @@
package com.android.systemui.tv.pip;
+import android.app.ActivityManager.RunningTaskInfo;
import android.app.ActivityManager.StackInfo;
import android.app.ActivityManagerNative;
import android.app.ActivityOptions;
@@ -37,8 +38,6 @@
import static android.app.ActivityManager.StackId.FULLSCREEN_WORKSPACE_STACK_ID;
import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
-import android.app.ActivityManager.RunningTaskInfo;
-
/**
* Manages the picture-in-picture (PIP) UI and states.
*/
@@ -105,14 +104,7 @@
@Override
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
- if (Intent.ACTION_PICTURE_IN_PICTURE_BUTTON.equals(action)) {
- if (DEBUG) Log.d(TAG, "PIP button pressed");
- if (!hasPipTasks()) {
- startPip();
- } else if (mState == STATE_PIP_OVERLAY) {
- showPipMenu();
- }
- } else if (Intent.ACTION_MEDIA_RESOURCE_GRANTED.equals(action)) {
+ if (Intent.ACTION_MEDIA_RESOURCE_GRANTED.equals(action)) {
String[] packageNames = intent.getStringArrayExtra(Intent.EXTRA_PACKAGES);
int resourceType = intent.getIntExtra(Intent.EXTRA_MEDIA_RESOURCE_TYPE,
INVALID_RESOURCE_TYPE);
@@ -151,18 +143,29 @@
Log.e(TAG, "registerTaskStackListener failed", e);
}
IntentFilter intentFilter = new IntentFilter();
- intentFilter.addAction(Intent.ACTION_PICTURE_IN_PICTURE_BUTTON);
intentFilter.addAction(Intent.ACTION_MEDIA_RESOURCE_GRANTED);
mContext.registerReceiver(mBroadcastReceiver, intentFilter);
}
+ /**
+ * Request PIP.
+ * It could either start PIP if there's none, and show PIP menu otherwise.
+ */
+ public void requestTvPictureInPicture() {
+ if (DEBUG) Log.d(TAG, "requestTvPictureInPicture()");
+ if (!hasPipTasks()) {
+ startPip();
+ } else if (mState == STATE_PIP_OVERLAY) {
+ showPipMenu();
+ }
+ }
+
private void startPip() {
try {
mActivityManager.moveTopActivityToPinnedStack(FULLSCREEN_WORKSPACE_STACK_ID, mPipBound);
} catch (RemoteException|IllegalArgumentException e) {
Log.e(TAG, "moveTopActivityToPinnedStack failed", e);
}
-
}
/**
diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java
index 97c70ed..15c55f5 100644
--- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java
@@ -19,7 +19,6 @@
import android.app.Activity;
import android.media.session.MediaController;
import android.os.Bundle;
-import android.util.Log;
import android.view.View;
import com.android.systemui.R;
diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipOverlayActivity.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipOverlayActivity.java
index de997a8..bc59a8c 100644
--- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipOverlayActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipOverlayActivity.java
@@ -19,7 +19,6 @@
import android.app.Activity;
import android.os.Bundle;
import android.os.Handler;
-import android.util.Log;
import android.view.View;
import com.android.systemui.R;
diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingSecondaryUserActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingSecondaryUserActivity.java
index 0979ffd..bafd1f1 100644
--- a/packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingSecondaryUserActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingSecondaryUserActivity.java
@@ -22,12 +22,9 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
-import android.content.pm.UserInfo;
import android.hardware.usb.UsbManager;
import android.os.Bundle;
import android.os.SystemProperties;
-import android.os.UserHandle;
-import android.os.UserManager;
import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
index 5dc468b..6aae9bd 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
@@ -16,9 +16,6 @@
package com.android.systemui.volume;
-import static android.accessibilityservice.AccessibilityServiceInfo.FEEDBACK_ALL_MASK;
-import static android.accessibilityservice.AccessibilityServiceInfo.FEEDBACK_GENERIC;
-
import android.accessibilityservice.AccessibilityServiceInfo;
import android.animation.LayoutTransition;
import android.animation.ValueAnimator;
@@ -77,6 +74,9 @@
import java.util.ArrayList;
import java.util.List;
+import static android.accessibilityservice.AccessibilityServiceInfo.FEEDBACK_ALL_MASK;
+import static android.accessibilityservice.AccessibilityServiceInfo.FEEDBACK_GENERIC;
+
/**
* Visual presentation of the volume dialog.
*
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java
index 673a30b..99c0f59 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java
@@ -41,7 +41,6 @@
import android.os.Vibrator;
import android.provider.Settings;
import android.service.notification.Condition;
-import android.service.notification.ZenModeConfig;
import android.util.Log;
import android.util.SparseArray;
diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk
index b7a41e2..964688b 100644
--- a/packages/SystemUI/tests/Android.mk
+++ b/packages/SystemUI/tests/Android.mk
@@ -17,12 +17,15 @@
LOCAL_MODULE_TAGS := tests
+LOCAL_JACK_FLAGS := --multi-dex native
+
LOCAL_PROTOC_OPTIMIZE_TYPE := nano
LOCAL_PROTOC_FLAGS := -I$(LOCAL_PATH)/..
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors
LOCAL_AAPT_FLAGS := --auto-add-overlay \
- --extra-packages com.android.systemui:com.android.keyguard:android.support.v14.preference:android.support.v7.preference:android.support.v7.appcompat:android.support.v7.recyclerview
+ --extra-packages com.android.systemui:com.android.keyguard:android.support.v14.preference:android.support.v7.preference:android.support.v7.appcompat:android.support.v7.recyclerview \
+ --extra-packages android.support.v17.leanback
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-Iaidl-files-under, src) \
@@ -35,6 +38,7 @@
frameworks/support/v14/preference/res \
frameworks/support/v7/appcompat/res \
frameworks/support/v7/recyclerview/res \
+ frameworks/support/v17/leanback/res \
frameworks/base/packages/SystemUI/res \
frameworks/base/packages/Keyguard/res
@@ -48,7 +52,8 @@
android-support-v7-recyclerview \
android-support-v7-preference \
android-support-v7-appcompat \
- android-support-v14-preference
+ android-support-v14-preference \
+ android-support-v17-leanback
# sign this with platform cert, so this test is allowed to inject key events into
# UI it doesn't own. This is necessary to allow screenshots to be taken
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServiceManagerTests.java b/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServiceManagerTests.java
index 4586c28..efdb50d 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServiceManagerTests.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServiceManagerTests.java
@@ -91,7 +91,7 @@
mTileServiceManager.calculateBindPriority(0);
// Priority shouldn't disappear after the request goes away if we just bound, instead
// it sticks around to avoid thrashing a bunch of processes.
- assertEquals(Integer.MAX_VALUE - 1, mTileServiceManager.getBindPriority());
+ assertEquals(Integer.MAX_VALUE - 2, mTileServiceManager.getBindPriority());
mTileServiceManager.setBindAllowed(false);
captor = ArgumentCaptor.forClass(Boolean.class);
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java
index 51fc7dd..425569c 100644
--- a/rs/java/android/renderscript/RenderScript.java
+++ b/rs/java/android/renderscript/RenderScript.java
@@ -98,13 +98,6 @@
*/
public static final int CREATE_FLAG_WAIT_FOR_ATTACH = 0x0008;
- /**
- * @hide
- * Context creation flag which specifies that optimization level 0 is
- * passed to the device compiler upon execution of the RenderScript kernel.
- * The default optimization level is 3.
- */
- public static final int CREATE_FLAG_OPT_LEVEL_0 = 0x0010;
/*
* Detect the bitness of the VM to allow FieldPacker to do the right thing.
@@ -1406,7 +1399,7 @@
}
if ((flags & ~(CREATE_FLAG_LOW_LATENCY | CREATE_FLAG_LOW_POWER |
- CREATE_FLAG_WAIT_FOR_ATTACH | CREATE_FLAG_OPT_LEVEL_0)) != 0) {
+ CREATE_FLAG_WAIT_FOR_ATTACH)) != 0) {
throw new RSIllegalArgumentException("Invalid flags passed.");
}
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index 03809c0..53504cc 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -27,6 +27,7 @@
import android.app.AlertDialog;
import android.app.PendingIntent;
import android.app.StatusBarManager;
+import android.app.UiAutomation;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.ContentResolver;
@@ -51,6 +52,7 @@
import android.os.Binder;
import android.os.Build;
import android.os.Bundle;
+import android.os.Debug;
import android.os.Handler;
import android.os.IBinder;
import android.os.Looper;
@@ -258,10 +260,9 @@
UserState userState = getCurrentUserStateLocked();
// We have to reload the installed services since some services may
// have different attributes, resolve info (does not support equals),
- // etc. Remove them then to force reload. Do it even if automation is
- // running since when it goes away, we will have to reload as well.
+ // etc. Remove them then to force reload.
userState.mInstalledServices.clear();
- if (userState.mUiAutomationService == null) {
+ if (!userState.isUiAutomationSuppressingOtherServices()) {
if (readConfigurationForUserStateLocked(userState)) {
onUserStateChangedLocked(userState);
}
@@ -296,7 +297,7 @@
TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES,
userState.mTouchExplorationGrantedServices, userId);
// We will update when the automation service dies.
- if (userState.mUiAutomationService == null) {
+ if (!userState.isUiAutomationSuppressingOtherServices()) {
onUserStateChangedLocked(userState);
}
return;
@@ -330,7 +331,7 @@
Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
userState.mEnabledServices, userId);
// We will update when the automation service dies.
- if (userState.mUiAutomationService == null) {
+ if (!userState.isUiAutomationSuppressingOtherServices()) {
onUserStateChangedLocked(userState);
}
}
@@ -362,7 +363,7 @@
} else if (Intent.ACTION_USER_PRESENT.equals(action)) {
// We will update when the automation service dies.
UserState userState = getCurrentUserStateLocked();
- if (userState.mUiAutomationService == null) {
+ if (!userState.isUiAutomationSuppressingOtherServices()) {
if (readConfigurationForUserStateLocked(userState)) {
onUserStateChangedLocked(userState);
}
@@ -473,11 +474,9 @@
final int resolvedUserId = mSecurityPolicy
.resolveCallingUserIdEnforcingPermissionsLocked(userId);
- // The automation service is a fake one and should not be reported
- // to clients as being enabled. The automation service is always the
- // only active one, if it exists.
+ // The automation service can suppress other services.
UserState userState = getUserStateLocked(resolvedUserId);
- if (userState.mUiAutomationService != null) {
+ if (userState.isUiAutomationSuppressingOtherServices()) {
return Collections.emptyList();
}
@@ -490,7 +489,9 @@
final int serviceCount = services.size();
for (int i = 0; i < serviceCount; i++) {
Service service = services.get(i);
- if ((service.mFeedbackType & feedbackTypeBit) != 0) {
+ // Don't report the UIAutomation (fake service)
+ if (!sFakeAccessibilityServiceComponentName.equals(service.mComponentName)
+ && (service.mFeedbackType & feedbackTypeBit) != 0) {
result.add(service.mAccessibilityServiceInfo);
}
}
@@ -621,7 +622,8 @@
@Override
public void registerUiTestAutomationService(IBinder owner,
IAccessibilityServiceClient serviceClient,
- AccessibilityServiceInfo accessibilityServiceInfo) {
+ AccessibilityServiceInfo accessibilityServiceInfo,
+ int flags) {
mSecurityPolicy.enforceCallingPermission(Manifest.permission.RETRIEVE_WINDOW_CONTENT,
FUNCTION_REGISTER_UI_TEST_AUTOMATION_SERVICE);
@@ -645,15 +647,17 @@
userState.mUiAutomationServiceOwner = owner;
userState.mUiAutomationServiceClient = serviceClient;
-
- // Set the temporary state.
+ userState.mUiAutomationFlags = flags;
userState.mIsAccessibilityEnabled = true;
- userState.mIsTouchExplorationEnabled = false;
- userState.mIsEnhancedWebAccessibilityEnabled = false;
- userState.mIsDisplayMagnificationEnabled = false;
- userState.mIsAutoclickEnabled = false;
userState.mInstalledServices.add(accessibilityServiceInfo);
- userState.mEnabledServices.clear();
+ if (userState.isUiAutomationSuppressingOtherServices()) {
+ // Set the temporary state.
+ userState.mIsTouchExplorationEnabled = false;
+ userState.mIsEnhancedWebAccessibilityEnabled = false;
+ userState.mIsDisplayMagnificationEnabled = false;
+ userState.mIsAutoclickEnabled = false;
+ userState.mEnabledServices.clear();
+ }
userState.mEnabledServices.add(sFakeAccessibilityServiceComponentName);
userState.mTouchExplorationGrantedServices.add(sFakeAccessibilityServiceComponentName);
@@ -694,7 +698,7 @@
UserState userState = getCurrentUserStateLocked();
// This is a nop if UI automation is enabled.
- if (userState.mUiAutomationService != null) {
+ if (userState.isUiAutomationSuppressingOtherServices()) {
return;
}
@@ -954,7 +958,15 @@
final UserState state = getCurrentUserStateLocked();
for (int i = state.mBoundServices.size() - 1; i >= 0; i--) {
final Service service = state.mBoundServices.get(i);
- service.notifyMagnificationChanged(region, scale, centerX, centerY);
+ service.notifyMagnificationChangedLocked(region, scale, centerX, centerY);
+ }
+ }
+
+ private void notifySoftKeyboardShowModeChangedLocked(int showMode) {
+ final UserState state = getCurrentUserStateLocked();
+ for (int i = state.mBoundServices.size() - 1; i >= 0; i--) {
+ final Service service = state.mBoundServices.get(i);
+ service.notifySoftKeyboardShowModeChangedLocked(showMode);
}
}
@@ -1027,6 +1039,9 @@
if (!mTempComponentNameSet.equals(userState.mEnabledServices)) {
userState.mEnabledServices.clear();
userState.mEnabledServices.addAll(mTempComponentNameSet);
+ if (userState.mUiAutomationService != null) {
+ userState.mEnabledServices.add(sFakeAccessibilityServiceComponentName);
+ }
mTempComponentNameSet.clear();
return true;
}
@@ -1400,6 +1415,7 @@
updateEnhancedWebAccessibilityLocked(userState);
updateDisplayColorAdjustmentSettingsLocked(userState);
updateMagnificationLocked(userState);
+ updateSoftKeyboardShowModeLocked(userState);
scheduleUpdateInputFilter(userState);
scheduleUpdateClientsIfNeededLocked(userState);
}
@@ -1616,6 +1632,18 @@
return false;
}
+ private boolean readSoftKeyboardShowModeChangedLocked(UserState userState) {
+ final int softKeyboardShowMode = Settings.Secure.getIntForUser(
+ mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_SOFT_KEYBOARD_MODE, 0,
+ userState.mUserId);
+ if (softKeyboardShowMode != userState.mSoftKeyboardShowMode) {
+ userState.mSoftKeyboardShowMode = softKeyboardShowMode;
+ return true;
+ }
+ return false;
+ }
+
private void updateTouchExplorationLocked(UserState userState) {
boolean enabled = false;
final int serviceCount = userState.mBoundServices.size();
@@ -1750,6 +1778,25 @@
return false;
}
+ private void updateSoftKeyboardShowModeLocked(UserState userState) {
+ final int userId = userState.mUserId;
+ if (userId == mCurrentUserId) {
+ // Check whether any Accessibility Services are still enabled and, if not, remove flag
+ // requesting no soft keyboard
+ final boolean accessibilityRequestingNoIme = userState.mSoftKeyboardShowMode == 1;
+ if (accessibilityRequestingNoIme && !userState.mIsAccessibilityEnabled) {
+ // No active Accessibility Services can be requesting the soft keyboard to be hidden
+ Settings.Secure.putIntForUser(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_SOFT_KEYBOARD_MODE,
+ 0,
+ userState.mUserId);
+ userState.mSoftKeyboardShowMode = 0;
+ }
+
+ notifySoftKeyboardShowModeChangedLocked(userState.mSoftKeyboardShowMode);
+ }
+ }
+
private MagnificationSpec getCompatibleMagnificationSpecLocked(int windowId) {
IBinder windowToken = mGlobalWindowTokens.get(windowId);
if (windowToken == null) {
@@ -2095,7 +2142,7 @@
};
// Handler for scheduling method invocations on the main thread.
- public InvocationHandler mInvocationHandler = new InvocationHandler(
+ public final InvocationHandler mInvocationHandler = new InvocationHandler(
mMainHandler.getLooper());
public Service(int userId, ComponentName componentName,
@@ -2290,17 +2337,20 @@
}
}
+ private boolean isCalledForCurrentUserLocked() {
+ // We treat calls from a profile as if made by its parent as profiles
+ // share the accessibility state of the parent. The call below
+ // performs the current profile parent resolution.
+ final int resolvedUserId = mSecurityPolicy
+ .resolveCallingUserIdEnforcingPermissionsLocked(UserHandle.USER_CURRENT);
+ return resolvedUserId == mCurrentUserId;
+ }
+
@Override
public List<AccessibilityWindowInfo> getWindows() {
ensureWindowsAvailableTimed();
synchronized (mLock) {
- // We treat calls from a profile as if made by its perent as profiles
- // share the accessibility state of the parent. The call below
- // performs the current profile parent resolution.
- final int resolvedUserId = mSecurityPolicy
- .resolveCallingUserIdEnforcingPermissionsLocked(
- UserHandle.USER_CURRENT);
- if (resolvedUserId != mCurrentUserId) {
+ if (!isCalledForCurrentUserLocked()) {
return null;
}
final boolean permissionGranted =
@@ -2328,13 +2378,7 @@
public AccessibilityWindowInfo getWindow(int windowId) {
ensureWindowsAvailableTimed();
synchronized (mLock) {
- // We treat calls from a profile as if made by its parent as profiles
- // share the accessibility state of the parent. The call below
- // performs the current profile parent resolution.
- final int resolvedUserId = mSecurityPolicy
- .resolveCallingUserIdEnforcingPermissionsLocked(
- UserHandle.USER_CURRENT);
- if (resolvedUserId != mCurrentUserId) {
+ if (!isCalledForCurrentUserLocked()) {
return null;
}
final boolean permissionGranted =
@@ -2361,13 +2405,7 @@
IAccessibilityInteractionConnection connection = null;
Region partialInteractiveRegion = Region.obtain();
synchronized (mLock) {
- // We treat calls from a profile as if made by its parent as profiles
- // share the accessibility state of the parent. The call below
- // performs the current profile parent resolution.
- final int resolvedUserId = mSecurityPolicy
- .resolveCallingUserIdEnforcingPermissionsLocked(
- UserHandle.USER_CURRENT);
- if (resolvedUserId != mCurrentUserId) {
+ if (!isCalledForCurrentUserLocked()) {
return false;
}
resolvedWindowId = resolveAccessibilityWindowIdLocked(accessibilityWindowId);
@@ -2418,13 +2456,7 @@
IAccessibilityInteractionConnection connection = null;
Region partialInteractiveRegion = Region.obtain();
synchronized (mLock) {
- // We treat calls from a profile as if made by its parent as profiles
- // share the accessibility state of the parent. The call below
- // performs the current profile parent resolution.
- final int resolvedUserId = mSecurityPolicy
- .resolveCallingUserIdEnforcingPermissionsLocked(
- UserHandle.USER_CURRENT);
- if (resolvedUserId != mCurrentUserId) {
+ if (!isCalledForCurrentUserLocked()) {
return false;
}
resolvedWindowId = resolveAccessibilityWindowIdLocked(accessibilityWindowId);
@@ -2475,13 +2507,7 @@
IAccessibilityInteractionConnection connection = null;
Region partialInteractiveRegion = Region.obtain();
synchronized (mLock) {
- // We treat calls from a profile as if made by its parent as profiles
- // share the accessibility state of the parent. The call below
- // performs the current profile parent resolution.
- final int resolvedUserId = mSecurityPolicy
- .resolveCallingUserIdEnforcingPermissionsLocked(
- UserHandle.USER_CURRENT);
- if (resolvedUserId != mCurrentUserId) {
+ if (!isCalledForCurrentUserLocked()) {
return false;
}
resolvedWindowId = resolveAccessibilityWindowIdLocked(accessibilityWindowId);
@@ -2532,13 +2558,7 @@
IAccessibilityInteractionConnection connection = null;
Region partialInteractiveRegion = Region.obtain();
synchronized (mLock) {
- // We treat calls from a profile as if made by its parent as profiles
- // share the accessibility state of the parent. The call below
- // performs the current profile parent resolution.
- final int resolvedUserId = mSecurityPolicy
- .resolveCallingUserIdEnforcingPermissionsLocked(
- UserHandle.USER_CURRENT);
- if (resolvedUserId != mCurrentUserId) {
+ if (!isCalledForCurrentUserLocked()) {
return false;
}
resolvedWindowId = resolveAccessibilityWindowIdForFindFocusLocked(
@@ -2590,13 +2610,7 @@
IAccessibilityInteractionConnection connection = null;
Region partialInteractiveRegion = Region.obtain();
synchronized (mLock) {
- // We treat calls from a profile as if made by its parent as profiles
- // share the accessibility state of the parent. The call below
- // performs the current profile parent resolution.
- final int resolvedUserId = mSecurityPolicy
- .resolveCallingUserIdEnforcingPermissionsLocked(
- UserHandle.USER_CURRENT);
- if (resolvedUserId != mCurrentUserId) {
+ if (!isCalledForCurrentUserLocked()) {
return false;
}
resolvedWindowId = resolveAccessibilityWindowIdLocked(accessibilityWindowId);
@@ -2663,13 +2677,7 @@
final int resolvedWindowId;
IAccessibilityInteractionConnection connection = null;
synchronized (mLock) {
- // We treat calls from a profile as if made by its parent as profiles
- // share the accessibility state of the parent. The call below
- // performs the current profile parent resolution.
- final int resolvedUserId = mSecurityPolicy
- .resolveCallingUserIdEnforcingPermissionsLocked(
- UserHandle.USER_CURRENT);
- if (resolvedUserId != mCurrentUserId) {
+ if (!isCalledForCurrentUserLocked()) {
return false;
}
resolvedWindowId = resolveAccessibilityWindowIdLocked(accessibilityWindowId);
@@ -2702,13 +2710,7 @@
@Override
public boolean performGlobalAction(int action) {
synchronized (mLock) {
- // We treat calls from a profile as if made by its parent as profiles
- // share the accessibility state of the parent. The call below
- // performs the current profile parent resolution.
- final int resolvedUserId = mSecurityPolicy
- .resolveCallingUserIdEnforcingPermissionsLocked(
- UserHandle.USER_CURRENT);
- if (resolvedUserId != mCurrentUserId) {
+ if (!isCalledForCurrentUserLocked()) {
return false;
}
}
@@ -2743,13 +2745,7 @@
@Override
public float getMagnificationScale() {
synchronized (mLock) {
- // We treat calls from a profile as if made by its parent as profiles
- // share the accessibility state of the parent. The call below
- // performs the current profile parent resolution.
- final int resolvedUserId = mSecurityPolicy
- .resolveCallingUserIdEnforcingPermissionsLocked(
- UserHandle.USER_CURRENT);
- if (resolvedUserId != mCurrentUserId) {
+ if (!isCalledForCurrentUserLocked()) {
return 1.0f;
}
}
@@ -2764,13 +2760,7 @@
@Override
public Region getMagnifiedRegion() {
synchronized (mLock) {
- // We treat calls from a profile as if made by its parent as profiles
- // share the accessibility state of the parent. The call below
- // performs the current profile parent resolution.
- final int resolvedUserId = mSecurityPolicy
- .resolveCallingUserIdEnforcingPermissionsLocked(
- UserHandle.USER_CURRENT);
- if (resolvedUserId != mCurrentUserId) {
+ if (!isCalledForCurrentUserLocked()) {
return Region.obtain();
}
}
@@ -2787,13 +2777,7 @@
@Override
public float getMagnificationCenterX() {
synchronized (mLock) {
- // We treat calls from a profile as if made by its parent as profiles
- // share the accessibility state of the parent. The call below
- // performs the current profile parent resolution.
- final int resolvedUserId = mSecurityPolicy
- .resolveCallingUserIdEnforcingPermissionsLocked(
- UserHandle.USER_CURRENT);
- if (resolvedUserId != mCurrentUserId) {
+ if (!isCalledForCurrentUserLocked()) {
return 0.0f;
}
}
@@ -2808,13 +2792,7 @@
@Override
public float getMagnificationCenterY() {
synchronized (mLock) {
- // We treat calls from a profile as if made by its parent as profiles
- // share the accessibility state of the parent. The call below
- // performs the current profile parent resolution.
- final int resolvedUserId = mSecurityPolicy
- .resolveCallingUserIdEnforcingPermissionsLocked(
- UserHandle.USER_CURRENT);
- if (resolvedUserId != mCurrentUserId) {
+ if (!isCalledForCurrentUserLocked()) {
return 0.0f;
}
}
@@ -2829,13 +2807,7 @@
@Override
public boolean resetMagnification(boolean animate) {
synchronized (mLock) {
- // We treat calls from a profile as if made by its parent as profiles
- // share the accessibility state of the parent. The call below
- // performs the current profile parent resolution.
- final int resolvedUserId = mSecurityPolicy
- .resolveCallingUserIdEnforcingPermissionsLocked(
- UserHandle.USER_CURRENT);
- if (resolvedUserId != mCurrentUserId) {
+ if (!isCalledForCurrentUserLocked()) {
return false;
}
final boolean permissionGranted = mSecurityPolicy.canControlMagnification(this);
@@ -2855,13 +2827,7 @@
public boolean setMagnificationScaleAndCenter(float scale, float centerX, float centerY,
boolean animate) {
synchronized (mLock) {
- // We treat calls from a profile as if made by its parent as profiles
- // share the accessibility state of the parent. The call below
- // performs the current profile parent resolution.
- final int resolvedUserId = mSecurityPolicy
- .resolveCallingUserIdEnforcingPermissionsLocked(
- UserHandle.USER_CURRENT);
- if (resolvedUserId != mCurrentUserId) {
+ if (!isCalledForCurrentUserLocked()) {
return false;
}
final boolean permissionGranted = mSecurityPolicy.canControlMagnification(this);
@@ -2884,6 +2850,33 @@
}
@Override
+ public boolean setSoftKeyboardShowMode(int showMode) {
+ final UserState userState;
+ synchronized (mLock) {
+ if (!isCalledForCurrentUserLocked()) {
+ return false;
+ }
+
+ userState = getCurrentUserStateLocked();
+ }
+
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ Settings.Secure.putIntForUser(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_SOFT_KEYBOARD_MODE, showMode,
+ userState.mUserId);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ return true;
+ }
+
+ @Override
+ public void setSoftKeyboardCallbackEnabled(boolean enabled) {
+ mInvocationHandler.setSoftKeyboardCallbackEnabled(enabled);
+ }
+
+ @Override
public void dump(FileDescriptor fd, final PrintWriter pw, String[] args) {
mSecurityPolicy.enforceCallingPermission(Manifest.permission.DUMP, FUNCTION_DUMP);
synchronized (mLock) {
@@ -3073,9 +3066,14 @@
InvocationHandler.MSG_CLEAR_ACCESSIBILITY_CACHE);
}
- public void notifyMagnificationChanged(@NonNull Region region,
+ public void notifyMagnificationChangedLocked(@NonNull Region region,
float scale, float centerX, float centerY) {
- mInvocationHandler.notifyMagnificationChanged(region, scale, centerX, centerY);
+ mInvocationHandler
+ .notifyMagnificationChangedLocked(region, scale, centerX, centerY);
+ }
+
+ public void notifySoftKeyboardShowModeChangedLocked(int showState) {
+ mInvocationHandler.notifySoftKeyboardShowModeChangedLocked(showState);
}
/**
@@ -3097,6 +3095,25 @@
}
}
+ /**
+ * Called by the invocation handler to notify the service that the state of the soft
+ * keyboard show mode has changed.
+ */
+ private void notifySoftKeyboardShowModeChangedInternal(int showState) {
+ final IAccessibilityServiceClient listener;
+ synchronized (mLock) {
+ listener = mServiceInterface;
+ }
+ if (listener != null) {
+ try {
+ listener.onSoftKeyboardShowModeChanged(showState);
+ } catch (RemoteException re) {
+ Slog.e(LOG_TAG, "Error sending soft keyboard show mode changes to " + mService,
+ re);
+ }
+ }
+ }
+
private void notifyGestureInternal(int gestureId) {
final IAccessibilityServiceClient listener;
synchronized (mLock) {
@@ -3232,8 +3249,10 @@
public static final int MSG_CLEAR_ACCESSIBILITY_CACHE = 2;
private static final int MSG_ON_MAGNIFICATION_CHANGED = 5;
+ private static final int MSG_ON_SOFT_KEYBOARD_STATE_CHANGED = 6;
private boolean mIsMagnificationCallbackEnabled = false;
+ private boolean mIsSoftKeyboardCallbackEnabled = false;
public InvocationHandler(Looper looper) {
super(looper, null, true);
@@ -3261,13 +3280,18 @@
notifyMagnificationChangedInternal(region, scale, centerX, centerY);
} break;
+ case MSG_ON_SOFT_KEYBOARD_STATE_CHANGED: {
+ final int showState = (int) message.arg1;
+ notifySoftKeyboardShowModeChangedInternal(showState);
+ } break;
+
default: {
throw new IllegalArgumentException("Unknown message: " + type);
}
}
}
- public void notifyMagnificationChanged(@NonNull Region region, float scale,
+ public void notifyMagnificationChangedLocked(@NonNull Region region, float scale,
float centerX, float centerY) {
if (!mIsMagnificationCallbackEnabled) {
// Callback is disabled, don't bother packing args.
@@ -3287,8 +3311,20 @@
public void setMagnificationCallbackEnabled(boolean enabled) {
mIsMagnificationCallbackEnabled = enabled;
}
- }
+ public void notifySoftKeyboardShowModeChangedLocked(int showState) {
+ if (!mIsSoftKeyboardCallbackEnabled) {
+ return;
+ }
+
+ final Message msg = obtainMessage(MSG_ON_SOFT_KEYBOARD_STATE_CHANGED, showState, 0);
+ msg.sendToTarget();
+ }
+
+ public void setSoftKeyboardCallbackEnabled(boolean enabled) {
+ mIsSoftKeyboardCallbackEnabled = enabled;
+ }
+ }
}
final class WindowsForAccessibilityCallback implements
@@ -3969,6 +4005,8 @@
public int mLastSentClientState = -1;
+ public int mSoftKeyboardShowMode = 0;
+
public boolean mIsAccessibilityEnabled;
public boolean mIsTouchExplorationEnabled;
public boolean mIsTextHighContrastEnabled;
@@ -3981,6 +4019,7 @@
public boolean mAccessibilityFocusOnlyInActiveWindow;
private Service mUiAutomationService;
+ private int mUiAutomationFlags;
private IAccessibilityServiceClient mUiAutomationServiceClient;
private IBinder mUiAutomationServiceOwner;
@@ -4040,10 +4079,12 @@
mIsEnhancedWebAccessibilityEnabled = false;
mIsDisplayMagnificationEnabled = false;
mIsAutoclickEnabled = false;
+ mSoftKeyboardShowMode = 0;
}
public void destroyUiAutomationService() {
mUiAutomationService = null;
+ mUiAutomationFlags = 0;
mUiAutomationServiceClient = null;
if (mUiAutomationServiceOwner != null) {
mUiAutomationServiceOwner.unlinkToDeath(
@@ -4051,6 +4092,11 @@
mUiAutomationServiceOwner = null;
}
}
+
+ boolean isUiAutomationSuppressingOtherServices() {
+ return ((mUiAutomationService != null) && (mUiAutomationFlags
+ & UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES) == 0);
+ }
}
private final class AccessibilityContentObserver extends ContentObserver {
@@ -4091,6 +4137,9 @@
private final Uri mHighTextContrastUri = Settings.Secure.getUriFor(
Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED);
+ private final Uri mAccessibilitySoftKeyboardModeUri = Settings.Secure.getUriFor(
+ Settings.Secure.ACCESSIBILITY_SOFT_KEYBOARD_MODE);
+
public AccessibilityContentObserver(Handler handler) {
super(handler);
}
@@ -4121,6 +4170,8 @@
mDisplayColorMatrixUri, false, this, UserHandle.USER_ALL);
contentResolver.registerContentObserver(
mHighTextContrastUri, false, this, UserHandle.USER_ALL);
+ contentResolver.registerContentObserver(
+ mAccessibilitySoftKeyboardModeUri, false, this, UserHandle.USER_ALL);
}
@Override
@@ -4130,8 +4181,8 @@
// we are checking for changes only the parent settings.
UserState userState = getCurrentUserStateLocked();
- // We will update when the automation service dies.
- if (userState.mUiAutomationService != null) {
+ // If the automation service is suppressing, we will update when it dies.
+ if (userState.isUiAutomationSuppressingOtherServices()) {
return;
}
@@ -4175,6 +4226,10 @@
if (readHighTextContrastEnabledSettingLocked(userState)) {
onUserStateChangedLocked(userState);
}
+ } else if (mAccessibilitySoftKeyboardModeUri.equals(uri)) {
+ if (readSoftKeyboardShowModeChangedLocked(userState)) {
+ onUserStateChangedLocked(userState);
+ }
}
}
}
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java
index 0513e53..c535ebd 100644
--- a/services/backup/java/com/android/server/backup/BackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -1049,7 +1049,9 @@
if (!SELinux.restorecon(mBaseStateDir)) {
Slog.e(TAG, "SELinux restorecon failed on " + mBaseStateDir);
}
- mDataDir = Environment.getDownloadCacheDirectory();
+
+ // This dir on /cache is managed directly in init.rc
+ mDataDir = new File(Environment.getDownloadCacheDirectory(), "backup_stage");
mPasswordVersion = 1; // unless we hear otherwise
mPasswordVersionFile = new File(mBaseStateDir, "pwversion");
@@ -8112,10 +8114,6 @@
ParcelFileDescriptor.MODE_CREATE |
ParcelFileDescriptor.MODE_TRUNCATE);
- if (!SELinux.restorecon(mBackupDataName)) {
- if (MORE_DEBUG) Slog.e(TAG, "SElinux restorecon failed for " + downloadFile);
- }
-
if (mTransport.getRestoreData(stage) != BackupTransport.TRANSPORT_OK) {
// Transport-level failure, so we wind everything up and
// terminate the restore operation.
@@ -8169,6 +8167,7 @@
// Okay, we have the data. Now have the agent do the restore.
stage.close();
+
mBackupData = ParcelFileDescriptor.open(mBackupDataName,
ParcelFileDescriptor.MODE_READ_ONLY);
@@ -9056,25 +9055,30 @@
Slog.d(TAG, "fullTransportBackup()");
}
- CountDownLatch latch = new CountDownLatch(1);
- PerformFullTransportBackupTask task = new PerformFullTransportBackupTask(null, pkgNames,
- false, null, latch, null, false /* userInitiated */);
- // Acquiring wakelock for PerformFullTransportBackupTask before its start.
- mWakelock.acquire();
- (new Thread(task, "full-transport-master")).start();
- do {
- try {
- latch.await();
- break;
- } catch (InterruptedException e) {
- // Just go back to waiting for the latch to indicate completion
- }
- } while (true);
+ final long oldId = Binder.clearCallingIdentity();
+ try {
+ CountDownLatch latch = new CountDownLatch(1);
+ PerformFullTransportBackupTask task = new PerformFullTransportBackupTask(null,
+ pkgNames, false, null, latch, null, false /* userInitiated */);
+ // Acquiring wakelock for PerformFullTransportBackupTask before its start.
+ mWakelock.acquire();
+ (new Thread(task, "full-transport-master")).start();
+ do {
+ try {
+ latch.await();
+ break;
+ } catch (InterruptedException e) {
+ // Just go back to waiting for the latch to indicate completion
+ }
+ } while (true);
- // We just ran a backup on these packages, so kick them to the end of the queue
- final long now = System.currentTimeMillis();
- for (String pkg : pkgNames) {
- enqueueFullBackup(pkg, now);
+ // We just ran a backup on these packages, so kick them to the end of the queue
+ final long now = System.currentTimeMillis();
+ for (String pkg : pkgNames) {
+ enqueueFullBackup(pkg, now);
+ }
+ } finally {
+ Binder.restoreCallingIdentity(oldId);
}
}
diff --git a/services/core/Android.mk b/services/core/Android.mk
index 666f2ff..aaa2211 100644
--- a/services/core/Android.mk
+++ b/services/core/Android.mk
@@ -12,4 +12,9 @@
LOCAL_JAVA_LIBRARIES := services.net telephony-common
LOCAL_STATIC_JAVA_LIBRARIES := tzdata_update
+ifneq ($(INCREMENTAL_BUILDS),)
+ LOCAL_PROGUARD_ENABLED := disabled
+ LOCAL_JACK_ENABLED := incremental
+endif
+
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index c3c3e3f..3fd8b40 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -33,7 +33,6 @@
import static android.net.NetworkPolicyManager.RULE_REJECT_METERED;
import android.annotation.Nullable;
-import android.app.AlarmManager;
import android.app.BroadcastOptions;
import android.app.Notification;
import android.app.NotificationManager;
@@ -88,7 +87,6 @@
import android.os.Process;
import android.os.RemoteException;
import android.os.ResultReceiver;
-import android.os.SystemClock;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
@@ -115,7 +113,6 @@
import com.android.internal.net.VpnConfig;
import com.android.internal.net.VpnInfo;
import com.android.internal.net.VpnProfile;
-import com.android.internal.telephony.DctConstants;
import com.android.internal.util.AsyncChannel;
import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.XmlUtils;
@@ -155,11 +152,9 @@
import java.util.HashSet;
import java.util.SortedSet;
import java.util.TreeSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* @hide
@@ -2186,7 +2181,7 @@
if (wasDefault) {
mDefaultInetConditionPublished = 0;
}
- notifyIfacesChanged();
+ notifyIfacesChangedForNetworkStats();
// TODO - we shouldn't send CALLBACK_LOST to requests that can be satisfied
// by other networks that are already connected. Perhaps that can be done by
// sending all CALLBACK_LOST messages (for requests, not listens) at the end
@@ -3800,6 +3795,12 @@
throw new IllegalArgumentException("Bad timeout specified");
}
+ if (NetworkCapabilities.MATCH_ALL_REQUESTS_NETWORK_SPECIFIER
+ .equals(networkCapabilities.getNetworkSpecifier())) {
+ throw new IllegalArgumentException("Invalid network specifier - must not be '"
+ + NetworkCapabilities.MATCH_ALL_REQUESTS_NETWORK_SPECIFIER + "'");
+ }
+
NetworkRequest networkRequest = new NetworkRequest(networkCapabilities, legacyType,
nextNetworkRequestId());
NetworkRequestInfo nri = new NetworkRequestInfo(messenger, networkRequest, binder,
@@ -4089,7 +4090,7 @@
}
// TODO - move this check to cover the whole function
if (!Objects.equals(newLp, oldLp)) {
- notifyIfacesChanged();
+ notifyIfacesChangedForNetworkStats();
notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED);
}
@@ -4713,7 +4714,11 @@
notifyLockdownVpn(networkAgent);
if (oldInfo != null && oldInfo.getState() == state) {
- if (VDBG) log("ignoring duplicate network state non-change");
+ if (oldInfo.isRoaming() != newInfo.isRoaming()) {
+ if (VDBG) log("roaming status changed, notifying NetworkStatsService");
+ notifyIfacesChangedForNetworkStats();
+ } else if (VDBG) log("ignoring duplicate network state non-change");
+ // In either case, no further work should be needed.
return;
}
if (DBG) {
@@ -4743,7 +4748,7 @@
}
networkAgent.created = true;
updateLinkProperties(networkAgent, null);
- notifyIfacesChanged();
+ notifyIfacesChangedForNetworkStats();
networkAgent.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_CONNECTED);
scheduleUnvalidatedPrompt(networkAgent);
@@ -4907,9 +4912,10 @@
}
/**
- * Notify other system services that set of active ifaces has changed.
+ * Notify NetworkStatsService that the set of active ifaces has changed, or that one of the
+ * properties tracked by NetworkStatsService on an active iface has changed.
*/
- private void notifyIfacesChanged() {
+ private void notifyIfacesChangedForNetworkStats() {
try {
mStatsService.forceUpdateIfaces();
} catch (Exception ignored) {
@@ -4943,7 +4949,7 @@
success = mVpns.get(user).setUnderlyingNetworks(networks);
}
if (success) {
- notifyIfacesChanged();
+ notifyIfacesChangedForNetworkStats();
}
return success;
}
diff --git a/services/core/java/com/android/server/DiskStatsService.java b/services/core/java/com/android/server/DiskStatsService.java
index bc12fc5..9313148 100644
--- a/services/core/java/com/android/server/DiskStatsService.java
+++ b/services/core/java/com/android/server/DiskStatsService.java
@@ -21,6 +21,7 @@
import android.os.Environment;
import android.os.StatFs;
import android.os.SystemClock;
+import android.os.storage.StorageManager;
import java.io.File;
import java.io.FileDescriptor;
@@ -79,6 +80,10 @@
reportFreeSpace(Environment.getDownloadCacheDirectory(), "Cache", pw);
reportFreeSpace(new File("/system"), "System", pw);
+ if (StorageManager.isNativeFileBasedEncryptionEnabled()) {
+ pw.println("File-based Encryption: true");
+ }
+
// TODO: Read /proc/yaffs and report interesting values;
// add configurable (through args) performance test parameters.
}
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java
index 4a123df..d77def6 100644
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -448,6 +448,7 @@
private int[] mSubtypeIds;
private Locale mLastSystemLocale;
private boolean mShowImeWithHardKeyboard;
+ private boolean mAccessibilityRequestingNoSoftKeyboard;
private final MyPackageMonitor mMyPackageMonitor = new MyPackageMonitor();
private final IPackageManager mIPackageManager;
private final String mSlotIme;
@@ -485,15 +486,31 @@
Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE), false, this, userId);
resolver.registerContentObserver(Settings.Secure.getUriFor(
Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD), false, this, userId);
+ resolver.registerContentObserver(Settings.Secure.getUriFor(
+ Settings.Secure.ACCESSIBILITY_SOFT_KEYBOARD_MODE), false, this, userId);
mRegistered = true;
}
@Override public void onChange(boolean selfChange, Uri uri) {
- final Uri showImeUri =
- Settings.Secure.getUriFor(Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD);
+ final Uri showImeUri = Settings.Secure.getUriFor(
+ Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD);
+ final Uri accessibilityRequestingNoImeUri = Settings.Secure.getUriFor(
+ Settings.Secure.ACCESSIBILITY_SOFT_KEYBOARD_MODE);
synchronized (mMethodMap) {
if (showImeUri.equals(uri)) {
updateKeyboardFromSettingsLocked();
+ } else if (accessibilityRequestingNoImeUri.equals(uri)) {
+ mAccessibilityRequestingNoSoftKeyboard = Settings.Secure.getIntForUser(
+ mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_SOFT_KEYBOARD_MODE,
+ 0, mUserId) == 1;
+ if (mAccessibilityRequestingNoSoftKeyboard) {
+ final boolean showRequested = mShowRequested;
+ hideCurrentInputLocked(0, null);
+ mShowRequested = showRequested;
+ } else if (mShowRequested) {
+ showCurrentInputLocked(InputMethodManager.SHOW_IMPLICIT, null);
+ }
} else {
boolean enabledChanged = false;
String newEnabled = mSettings.getEnabledInputMethodsStr();
@@ -655,7 +672,7 @@
boolean changed = false;
if (curIm != null) {
- int change = isPackageDisappearing(curIm.getPackageName());
+ int change = isPackageDisappearing(curIm.getPackageName());
if (change == PACKAGE_TEMPORARY_CHANGE
|| change == PACKAGE_PERMANENT_CHANGE) {
ServiceInfo si = null;
@@ -2073,12 +2090,15 @@
boolean showCurrentInputLocked(int flags, ResultReceiver resultReceiver) {
mShowRequested = true;
- if ((flags&InputMethodManager.SHOW_IMPLICIT) == 0) {
- mShowExplicitlyRequested = true;
+ if (mAccessibilityRequestingNoSoftKeyboard) {
+ return false;
}
+
if ((flags&InputMethodManager.SHOW_FORCED) != 0) {
mShowExplicitlyRequested = true;
mShowForced = true;
+ } else if ((flags&InputMethodManager.SHOW_IMPLICIT) == 0) {
+ mShowExplicitlyRequested = true;
}
if (!mSystemReady) {
@@ -3265,7 +3285,7 @@
"Requires permission "
+ android.Manifest.permission.WRITE_SECURE_SETTINGS);
}
-
+
long ident = Binder.clearCallingIdentity();
try {
return setInputMethodEnabledLocked(id, enabled);
diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java
index e9f0a7a..d0cd536 100644
--- a/services/core/java/com/android/server/LockSettingsService.java
+++ b/services/core/java/com/android/server/LockSettingsService.java
@@ -200,7 +200,7 @@
PendingIntent.FLAG_UPDATE_CURRENT);
Notification notification = new Notification.Builder(mContext)
- .setSmallIcon(com.android.internal.R.drawable.stat_sys_warning)
+ .setSmallIcon(com.android.internal.R.drawable.ic_secure)
.setWhen(0)
.setOngoing(true)
.setTicker(title)
diff --git a/services/core/java/com/android/server/SystemConfig.java b/services/core/java/com/android/server/SystemConfig.java
index 4dc46ac..5aba22d 100644
--- a/services/core/java/com/android/server/SystemConfig.java
+++ b/services/core/java/com/android/server/SystemConfig.java
@@ -16,20 +16,24 @@
package com.android.server;
+import static com.android.internal.util.ArrayUtils.appendInt;
+
import android.app.ActivityManager;
import android.content.pm.FeatureInfo;
-import android.os.*;
+import android.content.pm.PackageManager;
+import android.os.Environment;
import android.os.Process;
+import android.os.storage.StorageManager;
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.Slog;
import android.util.SparseArray;
import android.util.Xml;
-import libcore.io.IoUtils;
-
import com.android.internal.util.XmlUtils;
+import libcore.io.IoUtils;
+
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@@ -38,8 +42,6 @@
import java.io.FileReader;
import java.io.IOException;
-import static com.android.internal.util.ArrayUtils.appendInt;
-
/**
* Loads global system configuration info.
*/
@@ -351,10 +353,7 @@
Slog.w(TAG, "<feature> without name in " + permFile + " at "
+ parser.getPositionDescription());
} else if (allowed) {
- //Log.i(TAG, "Got feature " + fname);
- FeatureInfo fi = new FeatureInfo();
- fi.name = fname;
- mAvailableFeatures.put(fname, fi);
+ addFeature(fname);
}
XmlUtils.skipCurrentTag(parser);
continue;
@@ -443,10 +442,29 @@
IoUtils.closeQuietly(permReader);
}
- for (String fname : mUnavailableFeatures) {
- if (mAvailableFeatures.remove(fname) != null) {
- Slog.d(TAG, "Removed unavailable feature " + fname);
- }
+ // Some devices can be field-converted to FBE, so offer to splice in
+ // those features if not already defined by the static config
+ if (StorageManager.isNativeFileBasedEncryptionEnabled()) {
+ addFeature(PackageManager.FEATURE_FILE_BASED_ENCRYPTION);
+ addFeature(PackageManager.FEATURE_SECURELY_REMOVES_USERS);
+ }
+
+ for (String featureName : mUnavailableFeatures) {
+ removeFeature(featureName);
+ }
+ }
+
+ private void addFeature(String featureName) {
+ if (!mAvailableFeatures.containsKey(featureName)) {
+ final FeatureInfo fi = new FeatureInfo();
+ fi.name = featureName;
+ mAvailableFeatures.put(featureName, fi);
+ }
+ }
+
+ private void removeFeature(String featureName) {
+ if (mAvailableFeatures.remove(featureName) != null) {
+ Slog.d(TAG, "Removed unavailable feature " + featureName);
}
}
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 2c55ee2..655950e 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -7061,7 +7061,7 @@
}
@Override
- public boolean inMultiWindowMode(IBinder token) {
+ public boolean inMultiWindow(IBinder token) {
final long origId = Binder.clearCallingIdentity();
try {
synchronized(this) {
@@ -7078,7 +7078,7 @@
}
@Override
- public boolean inPictureInPictureMode(IBinder token) {
+ public boolean inPictureInPicture(IBinder token) {
final long origId = Binder.clearCallingIdentity();
try {
synchronized(this) {
@@ -7094,24 +7094,24 @@
}
@Override
- public void enterPictureInPictureMode(IBinder token) {
+ public void enterPictureInPicture(IBinder token) {
final long origId = Binder.clearCallingIdentity();
try {
synchronized(this) {
if (!mSupportsPictureInPicture) {
- throw new IllegalStateException("enterPictureInPictureMode: "
+ throw new IllegalStateException("enterPictureInPicture: "
+ "Device doesn't support picture-in-picture mode.");
}
final ActivityRecord r = ActivityRecord.forTokenLocked(token);
if (r == null) {
- throw new IllegalStateException("enterPictureInPictureMode: "
+ throw new IllegalStateException("enterPictureInPicture: "
+ "Can't find activity for token=" + token);
}
if (!r.supportsPictureInPicture()) {
- throw new IllegalArgumentException("enterPictureInPictureMode: "
+ throw new IllegalArgumentException("enterPictureInPicture: "
+ "Picture-In-Picture not supported for r=" + r);
}
@@ -7120,7 +7120,7 @@
? mDefaultPinnedStackBounds : null;
mStackSupervisor.moveActivityToStackLocked(
- r, PINNED_STACK_ID, "enterPictureInPictureMode", bounds);
+ r, PINNED_STACK_ID, "enterPictureInPicture", bounds);
}
} finally {
Binder.restoreCallingIdentity(origId);
@@ -8591,6 +8591,7 @@
if (tr.mBounds != null) {
rti.bounds = new Rect(tr.mBounds);
}
+ rti.isDockable = tr.canGoInDockedStack();
ActivityRecord base = null;
ActivityRecord top = null;
@@ -8875,7 +8876,7 @@
}
@Override
- public void setTaskResizeable(int taskId, boolean resizeable) {
+ public void setTaskResizeable(int taskId, int resizeableMode) {
synchronized (this) {
final TaskRecord task = mStackSupervisor.anyTaskForIdLocked(
taskId, !RESTORE_FROM_RECENTS, INVALID_STACK_ID);
@@ -8883,9 +8884,9 @@
Slog.w(TAG, "setTaskResizeable: taskId=" + taskId + " not found");
return;
}
- if (task.mResizeable != resizeable) {
- task.mResizeable = resizeable;
- mWindowManager.setTaskResizeable(taskId, resizeable);
+ if (task.mResizeMode != resizeableMode) {
+ task.mResizeMode = resizeableMode;
+ mWindowManager.setTaskResizeable(taskId, resizeableMode);
mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);
mStackSupervisor.resumeFocusedStackTopActivityLocked();
}
@@ -8904,10 +8905,10 @@
return;
}
int stackId = task.stack.mStackId;
- // First, check if this is a non-resizeble task in docked stack or if the task size
- // is affected by the docked stack changing size. If so, instead of resizing, we
- // can only scroll the task. No need to update configuration.
- if (bounds != null && !task.mResizeable
+ // We allow the task to scroll instead of resizing if this is a non-resizeable task
+ // in crop windows resize mode or if the task size is affected by the docked stack
+ // changing size. No need to update configuration.
+ if (bounds != null && task.inCropWindowsResizeMode()
&& mStackSupervisor.isStackDockedInEffect(stackId)) {
mWindowManager.scrollTask(task.taskId, bounds);
return;
@@ -9411,14 +9412,24 @@
}
@Override
- public void resizeStack(int stackId, Rect bounds, boolean allowResizeInDockedMode) {
+ public void resizeStack(int stackId, Rect bounds, boolean allowResizeInDockedMode,
+ boolean preserveWindows, boolean animate) {
enforceCallingPermission(MANAGE_ACTIVITY_STACKS, "resizeStack()");
long ident = Binder.clearCallingIdentity();
try {
synchronized (this) {
- mStackSupervisor.resizeStackLocked(
- stackId, bounds, null /* tempTaskBounds */, null /* tempTaskInsetBounds */,
- !PRESERVE_WINDOWS, allowResizeInDockedMode);
+ if (animate) {
+ if (stackId == PINNED_STACK_ID) {
+ mWindowManager.animateResizePinnedStack(bounds);
+ } else {
+ throw new IllegalArgumentException("Stack: " + stackId
+ + " doesn't support animated resize.");
+ }
+ } else {
+ mStackSupervisor.resizeStackLocked(stackId, bounds, null /* tempTaskBounds */,
+ null /* tempTaskInsetBounds */, preserveWindows,
+ allowResizeInDockedMode);
+ }
}
} finally {
Binder.restoreCallingIdentity(ident);
@@ -12154,6 +12165,7 @@
mWaitForDebugger = mOrigWaitForDebugger = waitForDebugger;
mAlwaysFinishActivities = alwaysFinishActivities;
mForceResizableActivities = forceResizable;
+ mWindowManager.setForceResizableTasks(mForceResizableActivities);
mSupportsFreeformWindowManagement = freeformWindowManagement || forceResizable;
mSupportsPictureInPicture = supportsPictureInPicture || forceResizable;
// This happens before any activities are started, so we can
@@ -12960,6 +12972,11 @@
final StringBuilder sb = new StringBuilder(1024);
appendDropBoxProcessHeaders(process, processName, sb);
+ if (process != null) {
+ sb.append("Foreground: ")
+ .append(process.isInterestingToUserLocked() ? "Yes" : "No")
+ .append("\n");
+ }
if (activity != null) {
sb.append("Activity: ").append(activity.shortComponentName).append("\n");
}
diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java
index 71008a9..ed26e0c 100755
--- a/services/core/java/com/android/server/am/ActivityRecord.java
+++ b/services/core/java/com/android/server/am/ActivityRecord.java
@@ -18,9 +18,9 @@
import static android.app.ActivityManager.StackId;
import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID;
+import static android.content.pm.ActivityInfo.RESIZE_MODE_CROP_WINDOWS;
import static android.content.pm.ActivityInfo.FLAG_ALWAYS_FOCUSABLE;
-import static android.content.pm.ActivityInfo.FLAG_RESIZEABLE;
-import static android.content.pm.ActivityInfo.FLAG_SUPPORTS_PICTURE_IN_PICTURE;
+import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE_AND_PIPABLE;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_CONFIGURATION;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_SAVED_STATE;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_SWITCH;
@@ -355,6 +355,9 @@
if (connections != null) {
pw.print(prefix); pw.print("connections="); pw.println(connections);
}
+ if (info != null) {
+ pw.println(prefix + "resizeMode=" + ActivityInfo.resizeModeToString(info.resizeMode));
+ }
}
public boolean crossesHorizontalSizeThreshold(int firstDp, int secondDp) {
@@ -754,11 +757,20 @@
}
boolean isResizeable() {
- return (info.flags & FLAG_RESIZEABLE) != 0;
+ return !isHomeActivity() && ActivityInfo.isResizeableMode(info.resizeMode);
+ }
+
+ boolean isResizeableOrForced() {
+ return !isHomeActivity() && (isResizeable() || service.mForceResizableActivities);
}
boolean supportsPictureInPicture() {
- return (info.flags & FLAG_SUPPORTS_PICTURE_IN_PICTURE) != 0;
+ return !isHomeActivity() && info.resizeMode == RESIZE_MODE_RESIZEABLE_AND_PIPABLE;
+ }
+
+ boolean canGoInDockedStack() {
+ return !isHomeActivity()
+ && (isResizeableOrForced() || info.resizeMode == RESIZE_MODE_CROP_WINDOWS);
}
boolean isAlwaysFocusable() {
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index ef8d230..577ca48 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -1410,14 +1410,11 @@
}
if (mStackId == DOCKED_STACK_ID) {
- // Docked stack is always visible, except in the case where the home activity
- // is the top running activity in the focused home stack.
- if (focusedStackId != HOME_STACK_ID) {
- return STACK_VISIBLE;
- }
- ActivityRecord topHomeActivity = focusedStack.topRunningActivityLocked();
- return topHomeActivity == null || !topHomeActivity.isHomeActivity() ?
- STACK_VISIBLE : STACK_INVISIBLE;
+ // Docked stack is always visible, except in the case where the top running activity
+ // task in the focus stack doesn't support any form of resizing.
+ final ActivityRecord r = focusedStack.topRunningActivityLocked();
+ final TaskRecord task = r != null ? r.task : null;
+ return task == null || task.canGoInDockedStack() ? STACK_VISIBLE : STACK_INVISIBLE;
}
// Find the first stack below focused stack that actually got something visible.
@@ -4545,6 +4542,7 @@
}
ci.numActivities = numActivities;
ci.numRunning = numRunning;
+ ci.isDockable = task.canGoInDockedStack();
list.add(ci);
}
}
@@ -4754,7 +4752,7 @@
// add the task to stack first, mTaskPositioner might need the stack association
addTask(task, toTop, "createTaskRecord");
final boolean isLockscreenShown = mService.mLockScreenShown == LOCK_SCREEN_SHOWN;
- if (!layoutTaskInStack(task, info.layout) && mBounds != null && task.mResizeable
+ if (!layoutTaskInStack(task, info.layout) && mBounds != null && task.isResizeable()
&& !isLockscreenShown) {
task.updateOverrideConfiguration(mBounds);
}
@@ -4803,7 +4801,7 @@
private void postAddTask(TaskRecord task, ActivityStack prevStack) {
if (prevStack != null) {
- task.reportPictureInPictureModeChangeIfNeeded(prevStack);
+ task.reportPictureInPictureChangeIfNeeded(prevStack);
} else if (task.voiceSession != null) {
try {
task.voiceSession.taskStarted(task.intent, task.taskId);
@@ -4819,8 +4817,7 @@
r.task.taskId, mStackId, r.info.screenOrientation, r.fullscreen,
(r.info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0, r.userId, r.info.configChanges,
task.voiceSession != null, r.mLaunchTaskBehind, bounds, task.mOverrideConfig,
- !r.isHomeActivity(), r.isAlwaysFocusable());
- mWindowManager.setTaskResizeable(task.taskId, task.mResizeable);
+ task.mResizeMode, r.isAlwaysFocusable(), task.isHomeTask());
r.taskConfigOverride = task.mOverrideConfig;
}
@@ -4863,7 +4860,7 @@
r.setTask(task, null);
task.addActivityToTop(r);
setAppTask(r, task);
- task.reportPictureInPictureModeChangeIfNeeded(prevStack);
+ task.reportPictureInPictureChangeIfNeeded(prevStack);
moveToFrontAndResumeStateIfNeeded(r, wasFocused, wasResumed, "moveActivityToStack");
if (wasResumed) {
prevStack.mResumedActivity = null;
@@ -4872,9 +4869,8 @@
private void setAppTask(ActivityRecord r, TaskRecord task) {
final Rect bounds = task.updateOverrideConfigurationFromLaunchBounds();
- mWindowManager.setAppTask(
- r.appToken, task.taskId, mStackId, bounds, task.mOverrideConfig);
- mWindowManager.setTaskResizeable(task.taskId, task.mResizeable);
+ mWindowManager.setAppTask(r.appToken, task.taskId, mStackId, bounds, task.mOverrideConfig,
+ task.mResizeMode, task.isHomeTask());
r.taskConfigOverride = task.mOverrideConfig;
}
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 8db2f8f..31712d9 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -98,6 +98,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import static android.Manifest.permission.START_ANY_ACTIVITY;
@@ -118,6 +119,7 @@
import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static android.content.pm.ActivityInfo.FLAG_SHOW_FOR_ALL_USERS;
+import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ALL;
@@ -1712,7 +1714,7 @@
return;
}
- if (task.mResizeable && options != null) {
+ if (task.isResizeable() && options != null) {
int stackId = options.getLaunchStackId();
if (canUseActivityOptionsLaunchBounds(options, stackId)) {
final Rect bounds = TaskRecord.validateBounds(options.getLaunchBounds());
@@ -1721,7 +1723,9 @@
stackId = task.getLaunchStackId();
}
if (stackId != task.stack.mStackId) {
- moveTaskToStackUncheckedLocked(task, stackId, ON_TOP, !FORCE_FOCUS, reason);
+ final ActivityStack stack = moveTaskToStackUncheckedLocked(
+ task, stackId, ON_TOP, !FORCE_FOCUS, reason);
+ stackId = stack.mStackId;
// moveTaskToStackUncheckedLocked() should already placed the task on top,
// still need moveTaskToFrontLocked() below for any transition settings.
}
@@ -1750,7 +1754,7 @@
boolean canUseActivityOptionsLaunchBounds(ActivityOptions options, int launchStackId) {
// We use the launch bounds in the activity options is the device supports freeform
// window management or is launching into the pinned stack.
- if (!options.hasLaunchBounds()) {
+ if (options.getLaunchBounds() == null) {
return false;
}
return (mService.mSupportsPictureInPicture && launchStackId == PINNED_STACK_ID)
@@ -1894,10 +1898,10 @@
mTmpBounds.clear();
mTmpConfigs.clear();
mTmpInsetBounds.clear();
- ArrayList<TaskRecord> tasks = stack.getAllTasks();
+ final ArrayList<TaskRecord> tasks = stack.getAllTasks();
for (int i = tasks.size() - 1; i >= 0; i--) {
- TaskRecord task = tasks.get(i);
- if (task.mResizeable) {
+ final TaskRecord task = tasks.get(i);
+ if (task.isResizeable()) {
if (stack.mStackId == FREEFORM_WORKSPACE_STACK_ID) {
// For freeform stack we don't adjust the size of the tasks to match that
// of the stack, but we do try to make sure the tasks are still contained
@@ -2009,7 +2013,7 @@
}
boolean resizeTaskLocked(TaskRecord task, Rect bounds, int resizeMode, boolean preserveWindow) {
- if (!task.mResizeable) {
+ if (!task.isResizeable()) {
Slog.w(TAG, "resizeTask: task " + task + " not resizeable.");
return true;
}
@@ -2019,7 +2023,7 @@
// If this is a forced resize, let it go through even if the bounds is not changing,
// as we might need a relayout due to surface size change (to/from fullscreen).
final boolean forced = (resizeMode & RESIZE_MODE_FORCED) != 0;
- if (task.mBounds != null && task.mBounds.equals(bounds) && !forced) {
+ if (Objects.equals(task.mBounds, bounds) && !forced) {
// Nothing to do here...
return true;
}
@@ -2131,7 +2135,12 @@
private boolean restoreRecentTaskLocked(TaskRecord task, int stackId) {
if (stackId == INVALID_STACK_ID) {
stackId = task.getLaunchStackId();
+ } else if (stackId == DOCKED_STACK_ID && !task.canGoInDockedStack()) {
+ // Preferred stack is the docked stack, but the task can't go in the docked stack.
+ // Put it in the fullscreen stack.
+ stackId = FULLSCREEN_WORKSPACE_STACK_ID;
}
+
if (task.stack != null) {
// Task has already been restored once. See if we need to do anything more
if (task.stack.mStackId == stackId) {
@@ -2167,8 +2176,7 @@
* Moves the specified task record to the input stack id.
* WARNING: This method performs an unchecked/raw move of the task and
* can leave the system in an unstable state if used incorrectly.
- * Use {@link #moveTaskToStackLocked} to perform safe task movement
- * to a stack.
+ * Use {@link #moveTaskToStackLocked} to perform safe task movement to a stack.
* @param task Task to move.
* @param stackId Id of stack to move task to.
* @param toTop True if the task should be placed at the top of the stack.
@@ -2188,13 +2196,24 @@
final boolean wasFront = isFrontStack(prevStack)
&& (prevStack.topRunningActivityLocked() == r);
- final boolean resizeable = task.mResizeable;
+ final int resizeMode = task.mResizeMode;
+
+ if (stackId == DOCKED_STACK_ID && resizeMode == RESIZE_MODE_UNRESIZEABLE) {
+ // We don't allow moving a unresizeable task to the docked stack since the docked
+ // stack is used for split-screen mode and will cause things like the docked divider to
+ // show up. We instead leave the task in its current stack or move it to the fullscreen
+ // stack if it isn't currently in a stack.
+ stackId = (prevStack != null) ? prevStack.mStackId : FULLSCREEN_WORKSPACE_STACK_ID;
+ Slog.w(TAG, "Can not move unresizeable task=" + task
+ + " to docked stack. Moving to stackId=" + stackId + " instead.");
+ }
+
// Temporarily disable resizeablility of task we are moving. We don't want it to be resized
// if a docked stack is created below which will lead to the stack we are moving from and
// its resizeable tasks being resized.
- task.mResizeable = false;
+ task.mResizeMode = RESIZE_MODE_UNRESIZEABLE;
final ActivityStack stack = getStack(stackId, CREATE_IF_NEEDED, toTop);
- task.mResizeable = resizeable;
+ task.mResizeMode = resizeMode;
mWindowManager.moveTaskToStack(task.taskId, stack.mStackId, toTop);
stack.addTask(task, toTop, reason);
@@ -2234,8 +2253,10 @@
// during the relaunch. If we end up not doing any relaunch, we clear the flags later.
mWindowManager.setReplacingWindow(topActivity.appToken, animate);
}
+ final int preferredLaunchStackId = stackId;
final ActivityStack stack = moveTaskToStackUncheckedLocked(
task, stackId, toTop, forceFocus, "moveTaskToStack:" + reason);
+ stackId = stack.mStackId;
if (!animate) {
stack.mNoAnimActivities.add(topActivity);
@@ -2257,10 +2278,7 @@
// If we didn't actual do a relaunch (indicated by kept==true meaning we kept the old
// window), we need to clear the replace window settings. Otherwise, we schedule a
// timeout to remove the old window if the replacing window is not coming in time.
- // In case of the pinned stack we don't resize the task during the move, but we will
- // resize the stack soon after so we want to retain the replacing window.
- mWindowManager.scheduleClearReplacingWindowIfNeeded(topActivity.appToken,
- !kept || stackId == PINNED_STACK_ID);
+ mWindowManager.scheduleClearReplacingWindowIfNeeded(topActivity.appToken, !kept);
}
// The task might have already been running and its visibility needs to be synchronized with
@@ -2268,9 +2286,7 @@
ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);
resumeFocusedStackTopActivityLocked();
- if (!task.mResizeable && isStackDockedInEffect(stackId)) {
- showNonResizeableDockToast(taskId);
- }
+ showNonResizeableDockToastIfNeeded(task, preferredLaunchStackId, stackId);
}
boolean moveTopStackActivityToPinnedStackLocked(int stackId, Rect bounds) {
@@ -2294,7 +2310,8 @@
return false;
}
- moveActivityToStackLocked(r, PINNED_STACK_ID, "moveTopActivityToPinnedStack", bounds);
+ moveActivityToStackLocked(r, PINNED_STACK_ID, "moveTopActivityToPinnedStack", null);
+ mWindowManager.animateResizePinnedStack(bounds);
return true;
}
@@ -3221,8 +3238,17 @@
}
}
- void showNonResizeableDockToast(int taskId) {
- mWindowManager.scheduleShowNonResizeableDockToast(taskId);
+ void showNonResizeableDockToastIfNeeded(
+ TaskRecord task, int preferredStackId, int actualStackId) {
+ if (!isStackDockedInEffect(actualStackId) && preferredStackId != DOCKED_STACK_ID) {
+ return;
+ }
+
+ if (!task.canGoInDockedStack() || task.inCropWindowsResizeMode()) {
+ // Display warning toast if we tried to put a non-dockable task in the docked stack or
+ // the task is running in cropped window mode.
+ mWindowManager.scheduleShowNonResizeableDockToast(task.taskId);
+ }
}
void showLockTaskToast() {
diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java
index 7b7359f..8a01659 100644
--- a/services/core/java/com/android/server/am/ActivityStarter.java
+++ b/services/core/java/com/android/server/am/ActivityStarter.java
@@ -17,7 +17,7 @@
import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
-import static android.content.Intent.FLAG_ACTIVITY_LAUNCH_TO_SIDE;
+import static android.content.Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT;
import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
@@ -1004,10 +1004,10 @@
}
mSupervisor.updateUserStackLocked(mStartActivity.userId, mTargetStack);
- if (!mStartActivity.task.mResizeable
- && mSupervisor.isStackDockedInEffect(mTargetStack.mStackId)) {
- mSupervisor.showNonResizeableDockToast(mStartActivity.task.taskId);
- }
+ final int preferredLaunchStackId =
+ (mOptions != null) ? mOptions.getLaunchStackId() : INVALID_STACK_ID;
+ mSupervisor.showNonResizeableDockToastIfNeeded(
+ mStartActivity.task, preferredLaunchStackId, mTargetStack.mStackId);
return START_SUCCESS;
}
@@ -1484,8 +1484,9 @@
mInTask.updateOverrideConfiguration(mLaunchBounds);
int stackId = mInTask.getLaunchStackId();
if (stackId != mInTask.stack.mStackId) {
- mSupervisor.moveTaskToStackUncheckedLocked(
+ final ActivityStack stack = mSupervisor.moveTaskToStackUncheckedLocked(
mInTask, stackId, ON_TOP, !FORCE_FOCUS, "inTaskToFront");
+ stackId = stack.mStackId;
}
if (StackId.resizeStackWithLaunchBounds(stackId)) {
mSupervisor.resizeStackLocked(stackId, mLaunchBounds,
@@ -1627,10 +1628,9 @@
// If the freeform or docked stack has focus, and the activity to be launched is resizeable,
// we can also put it in the focused stack.
final int focusedStackId = mSupervisor.mFocusedStack.mStackId;
- final boolean canUseFocusedStack =
- focusedStackId == FULLSCREEN_WORKSPACE_STACK_ID
- || focusedStackId == DOCKED_STACK_ID
- || (focusedStackId == FREEFORM_WORKSPACE_STACK_ID && r.isResizeable());
+ final boolean canUseFocusedStack = focusedStackId == FULLSCREEN_WORKSPACE_STACK_ID
+ || (focusedStackId == DOCKED_STACK_ID && r.canGoInDockedStack())
+ || (focusedStackId == FREEFORM_WORKSPACE_STACK_ID && r.isResizeableOrForced());
if (canUseFocusedStack && (!newTask
|| mSupervisor.mFocusedStack.mActivityContainer.isEligibleForNewTasks())) {
if (DEBUG_FOCUS || DEBUG_STACK) Slog.d(TAG_FOCUS,
@@ -1666,9 +1666,13 @@
if (isValidLaunchStackId(launchStackId, r)) {
return mSupervisor.getStack(launchStackId, CREATE_IF_NEEDED, ON_TOP);
+ } else if (launchStackId == DOCKED_STACK_ID) {
+ // The preferred launch stack is the docked stack, but it isn't a valid launch stack
+ // for this activity, so we put the activity in the fullscreen stack.
+ return mSupervisor.getStack(FULLSCREEN_WORKSPACE_STACK_ID, CREATE_IF_NEEDED, ON_TOP);
}
- if (!launchToSideAllowed || (launchFlags & FLAG_ACTIVITY_LAUNCH_TO_SIDE) == 0) {
+ if (!launchToSideAllowed || (launchFlags & FLAG_ACTIVITY_LAUNCH_ADJACENT) == 0) {
return null;
}
@@ -1701,9 +1705,11 @@
return false;
}
- final boolean resizeable = r.isResizeable() || mService.mForceResizableActivities;
+ if (stackId == DOCKED_STACK_ID && r.canGoInDockedStack()) {
+ return true;
+ }
- if (stackId != FULLSCREEN_WORKSPACE_STACK_ID && !resizeable) {
+ if (stackId != FULLSCREEN_WORKSPACE_STACK_ID && !r.isResizeableOrForced()) {
return false;
}
@@ -1721,7 +1727,7 @@
Rect getOverrideBounds(ActivityRecord r, ActivityOptions options, TaskRecord inTask) {
Rect newBounds = null;
- if (options != null && (r.isResizeable() || (inTask != null && inTask.mResizeable))) {
+ if (options != null && (r.isResizeable() || (inTask != null && inTask.isResizeable()))) {
if (mSupervisor.canUseActivityOptionsLaunchBounds(
options, options.getLaunchStackId())) {
newBounds = TaskRecord.validateBounds(options.getLaunchBounds());
diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java
index 58d9f45..190e9e1 100644
--- a/services/core/java/com/android/server/am/AppErrors.java
+++ b/services/core/java/com/android/server/am/AppErrors.java
@@ -745,7 +745,8 @@
if (mService.mController != null) {
try {
// 0 == continue, -1 = kill process immediately
- int res = mService.mController.appEarlyNotResponding(app.processName, app.pid, annotation);
+ int res = mService.mController.appEarlyNotResponding(
+ app.processName, app.pid, annotation);
if (res < 0 && app.pid != MY_PID) {
app.kill("anr", true);
}
diff --git a/services/core/java/com/android/server/am/AppNotRespondingDialog.java b/services/core/java/com/android/server/am/AppNotRespondingDialog.java
index 4587b72..9875887 100644
--- a/services/core/java/com/android/server/am/AppNotRespondingDialog.java
+++ b/services/core/java/com/android/server/am/AppNotRespondingDialog.java
@@ -21,12 +21,19 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Resources;
+import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.util.Slog;
+import android.view.LayoutInflater;
+import android.view.View;
import android.view.WindowManager;
+import android.widget.FrameLayout;
+import android.widget.TextView;
-final class AppNotRespondingDialog extends BaseErrorDialog {
+import static com.android.server.am.ActivityManagerService.IS_USER_BUILD;
+
+final class AppNotRespondingDialog extends BaseErrorDialog implements View.OnClickListener {
private static final String TAG = "AppNotRespondingDialog";
// Event 'what' codes
@@ -36,15 +43,15 @@
private final ActivityManagerService mService;
private final ProcessRecord mProc;
-
+
public AppNotRespondingDialog(ActivityManagerService service, Context context,
ProcessRecord app, ActivityRecord activity, boolean aboveSystem) {
super(context);
-
+
mService = service;
mProc = app;
Resources res = context.getResources();
-
+
setCancelable(false);
int resid;
@@ -71,24 +78,10 @@
}
}
- setMessage(name2 != null
+ setTitle(name2 != null
? res.getString(resid, name1.toString(), name2.toString())
: res.getString(resid, name1.toString()));
- setButton(DialogInterface.BUTTON_POSITIVE,
- res.getText(com.android.internal.R.string.force_close),
- mHandler.obtainMessage(FORCE_CLOSE));
- setButton(DialogInterface.BUTTON_NEGATIVE,
- res.getText(com.android.internal.R.string.wait),
- mHandler.obtainMessage(WAIT));
-
- if (app.errorReportReceiver != null) {
- setButton(DialogInterface.BUTTON_NEUTRAL,
- res.getText(com.android.internal.R.string.report),
- mHandler.obtainMessage(WAIT_AND_REPORT));
- }
-
- setTitle(res.getText(com.android.internal.R.string.anr_title));
if (aboveSystem) {
getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR);
}
@@ -99,7 +92,41 @@
getWindow().setAttributes(attrs);
}
- public void onStop() {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ final FrameLayout frame = (FrameLayout) findViewById(android.R.id.custom);
+ final Context context = getContext();
+ LayoutInflater.from(context).inflate(
+ com.android.internal.R.layout.app_anr_dialog, frame, true);
+
+ final TextView report = (TextView) findViewById(com.android.internal.R.id.aerr_report);
+ report.setOnClickListener(this);
+ final boolean hasReceiver = mProc.errorReportReceiver != null;
+ report.setVisibility(hasReceiver ? View.VISIBLE : View.GONE);
+ final TextView close = (TextView) findViewById(com.android.internal.R.id.aerr_close);
+ close.setOnClickListener(this);
+ final TextView wait = (TextView) findViewById(com.android.internal.R.id.aerr_wait);
+ wait.setOnClickListener(this);
+
+ findViewById(com.android.internal.R.id.customPanel).setVisibility(View.VISIBLE);
+ }
+
+ @Override
+ public void onClick(View v) {
+ switch (v.getId()) {
+ case com.android.internal.R.id.aerr_report:
+ mHandler.obtainMessage(WAIT_AND_REPORT).sendToTarget();
+ break;
+ case com.android.internal.R.id.aerr_close:
+ mHandler.obtainMessage(FORCE_CLOSE).sendToTarget();
+ break;
+ case com.android.internal.R.id.aerr_wait:
+ mHandler.obtainMessage(WAIT).sendToTarget();
+ break;
+ default:
+ break;
+ }
}
private final Handler mHandler = new Handler() {
@@ -138,6 +165,8 @@
Slog.w(TAG, "bug report receiver dissappeared", e);
}
}
+
+ dismiss();
}
};
}
diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java
index fd787df..272f26f 100644
--- a/services/core/java/com/android/server/am/TaskRecord.java
+++ b/services/core/java/com/android/server/am/TaskRecord.java
@@ -24,7 +24,9 @@
import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
import static android.content.Intent.FLAG_ACTIVITY_RETAIN_IN_RECENTS;
-import static android.content.pm.ActivityInfo.FLAG_RESIZEABLE;
+import static android.content.pm.ActivityInfo.RESIZE_MODE_CROP_WINDOWS;
+import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE;
+import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE;
import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_ALWAYS;
import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_DEFAULT;
import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED;
@@ -117,7 +119,10 @@
private static final String ATTR_TASK_AFFILIATION_COLOR = "task_affiliation_color";
private static final String ATTR_CALLING_UID = "calling_uid";
private static final String ATTR_CALLING_PACKAGE = "calling_package";
+ // TODO(b/26847884): Currently needed while migrating to resize_mode.
+ // Can be removed at some later point.
private static final String ATTR_RESIZEABLE = "resizeable";
+ private static final String ATTR_RESIZE_MODE = "resize_mode";
private static final String ATTR_PRIVILEGED = "privileged";
private static final String ATTR_NON_FULLSCREEN_BOUNDS = "non_fullscreen_bounds";
@@ -155,8 +160,8 @@
int numFullscreen; // Number of fullscreen activities.
- boolean mResizeable; // Activities in the task resizeable. Based on the resizable setting of
- // the root activity.
+ int mResizeMode; // The resize mode of this task and its activities.
+ // Based on the {@link ActivityInfo#resizeMode} of the root activity.
int mLockTaskMode; // Which tasklock mode to launch this task in. One of
// ActivityManager.LOCK_TASK_LAUNCH_MODE_*
private boolean mPrivileged; // The root activity application of this task holds
@@ -308,7 +313,7 @@
boolean neverRelinquishIdentity, TaskDescription _lastTaskDescription,
TaskThumbnailInfo lastThumbnailInfo, int taskAffiliation, int prevTaskId,
int nextTaskId, int taskAffiliationColor, int callingUid, String callingPackage,
- boolean resizeable, boolean privileged, boolean realActivitySuspended) {
+ int resizeMode, boolean privileged, boolean _realActivitySuspended) {
mService = service;
mFilename = String.valueOf(_taskId) + TASK_THUMBNAIL_SUFFIX +
TaskPersister.IMAGE_EXTENSION;
@@ -322,7 +327,7 @@
voiceSession = null;
voiceInteractor = null;
realActivity = _realActivity;
- realActivitySuspended = realActivitySuspended;
+ realActivitySuspended = _realActivitySuspended;
origActivity = _origActivity;
rootWasReset = _rootWasReset;
isAvailable = true;
@@ -345,7 +350,7 @@
mNextAffiliateTaskId = nextTaskId;
mCallingUid = callingUid;
mCallingPackage = callingPackage;
- mResizeable = resizeable || mService.mForceResizableActivities;
+ mResizeMode = resizeMode;
mPrivileged = privileged;
ActivityInfo info = (mActivities.size() > 0) ? mActivities.get(0).info : null;
mMinimalSize = info != null && info.layout != null ? info.layout.minimalSize : -1;
@@ -447,7 +452,7 @@
} else {
autoRemoveRecents = false;
}
- mResizeable = (info.flags & FLAG_RESIZEABLE) != 0 || mService.mForceResizableActivities;
+ mResizeMode = info.resizeMode;
mLockTaskMode = info.lockTaskLaunchMode;
mPrivileged = (info.applicationInfo.privateFlags & PRIVATE_FLAG_PRIVILEGED) != 0;
setLockTaskAuth();
@@ -702,9 +707,6 @@
// Only set this based on the first activity
if (mActivities.isEmpty()) {
taskType = r.mActivityType;
- if (taskType == HOME_ACTIVITY_TYPE && mService.mForceResizableActivities) {
- mResizeable = r.isResizeable();
- }
isPersistable = r.isPersistable();
mCallingUid = r.launchedFromUid;
mCallingPackage = r.launchedFromPackage;
@@ -932,6 +934,19 @@
return mTaskToReturnTo == HOME_ACTIVITY_TYPE || mTaskToReturnTo == RECENTS_ACTIVITY_TYPE;
}
+ boolean isResizeable() {
+ return !isHomeTask() && (mService.mForceResizableActivities
+ || ActivityInfo.isResizeableMode(mResizeMode));
+ }
+
+ boolean inCropWindowsResizeMode() {
+ return !isResizeable() && mResizeMode == RESIZE_MODE_CROP_WINDOWS;
+ }
+
+ boolean canGoInDockedStack() {
+ return isResizeable() || inCropWindowsResizeMode();
+ }
+
/**
* Find the activity in the history stack within the given task. Returns
* the index within the history at which it's found, or < 0 if not found.
@@ -1070,7 +1085,7 @@
out.attribute(null, ATTR_NEXT_AFFILIATION, String.valueOf(mNextAffiliateTaskId));
out.attribute(null, ATTR_CALLING_UID, String.valueOf(mCallingUid));
out.attribute(null, ATTR_CALLING_PACKAGE, mCallingPackage == null ? "" : mCallingPackage);
- out.attribute(null, ATTR_RESIZEABLE, String.valueOf(mResizeable));
+ out.attribute(null, ATTR_RESIZE_MODE, String.valueOf(mResizeMode));
out.attribute(null, ATTR_PRIVILEGED, String.valueOf(mPrivileged));
if (mLastNonFullscreenBounds != null) {
out.attribute(
@@ -1136,7 +1151,7 @@
int nextTaskId = INVALID_TASK_ID;
int callingUid = -1;
String callingPackage = "";
- boolean resizeable = false;
+ int resizeMode = RESIZE_MODE_UNRESIZEABLE;
boolean privileged = false;
Rect bounds = null;
@@ -1197,7 +1212,10 @@
} else if (ATTR_CALLING_PACKAGE.equals(attrName)) {
callingPackage = attrValue;
} else if (ATTR_RESIZEABLE.equals(attrName)) {
- resizeable = Boolean.valueOf(attrValue);
+ resizeMode = Boolean.valueOf(attrValue)
+ ? RESIZE_MODE_RESIZEABLE : RESIZE_MODE_CROP_WINDOWS;
+ } else if (ATTR_RESIZE_MODE.equals(attrName)) {
+ resizeMode = Integer.valueOf(attrValue);
} else if (ATTR_PRIVILEGED.equals(attrName)) {
privileged = Boolean.valueOf(attrValue);
} else if (ATTR_NON_FULLSCREEN_BOUNDS.equals(attrName)) {
@@ -1261,7 +1279,7 @@
autoRemoveRecents, askedCompatMode, taskType, userId, effectiveUid, lastDescription,
activities, firstActiveTime, lastActiveTime, lastTimeOnTop, neverRelinquishIdentity,
taskDescription, thumbnailInfo, taskAffiliation, prevTaskId, nextTaskId,
- taskAffiliationColor, callingUid, callingPackage, resizeable, privileged,
+ taskAffiliationColor, callingUid, callingPackage, resizeMode, privileged,
realActivitySuspended);
task.updateOverrideConfiguration(bounds);
@@ -1304,7 +1322,7 @@
}
if (mFullscreen != oldFullscreen) {
- reportMultiWindowModeChange();
+ reportMultiWindowChange();
}
return !mOverrideConfig.equals(oldConfig) ? mOverrideConfig : null;
@@ -1359,22 +1377,22 @@
return bounds;
}
- private void reportMultiWindowModeChange() {
+ private void reportMultiWindowChange() {
for (int i = mActivities.size() - 1; i >= 0; i--) {
final ActivityRecord r = mActivities.get(i);
if (r.app != null && r.app.thread != null) {
try {
// An activity is consider to be in multi-window mode if its task isn't
// fullscreen.
- r.app.thread.scheduleMultiWindowModeChanged(r.appToken, !mFullscreen);
+ r.app.thread.scheduleMultiWindowChanged(r.appToken, !mFullscreen);
} catch (Exception e) {
- Slog.e(TAG, "TaskRecord.reportMultiWindowModeChange: ", e);
+ Slog.e(TAG, "TaskRecord.reportMultiWindowChange: ", e);
}
}
}
}
- void reportPictureInPictureModeChangeIfNeeded(ActivityStack prevStack) {
+ void reportPictureInPictureChangeIfNeeded(ActivityStack prevStack) {
if (prevStack == null || prevStack == stack
|| (prevStack.mStackId != PINNED_STACK_ID && stack.mStackId != PINNED_STACK_ID)) {
return;
@@ -1384,10 +1402,10 @@
final ActivityRecord r = mActivities.get(i);
if (r.app != null && r.app.thread != null) {
try {
- r.app.thread.schedulePictureInPictureModeChanged(
+ r.app.thread.schedulePictureInPictureChanged(
r.appToken, stack.mStackId == PINNED_STACK_ID);
} catch (Exception e) {
- Slog.e(TAG, "TaskRecord.reportMultiWindowModeChange: ", e);
+ Slog.e(TAG, "TaskRecord.reportPictureInPictureChangeIfNeeded: ", e);
}
}
}
@@ -1401,7 +1419,7 @@
}
if (inStack.mStackId == FREEFORM_WORKSPACE_STACK_ID) {
- if (!mResizeable) {
+ if (!isResizeable()) {
throw new IllegalArgumentException("Can not position non-resizeable task="
+ this + " in stack=" + inStack);
}
@@ -1447,8 +1465,8 @@
final int stackId = stack.mStackId;
if (stackId == HOME_STACK_ID
|| stackId == FULLSCREEN_WORKSPACE_STACK_ID
- || (stackId == DOCKED_STACK_ID && !mResizeable)) {
- return mResizeable ? stack.mBounds : null;
+ || (stackId == DOCKED_STACK_ID && !isResizeable())) {
+ return isResizeable() ? stack.mBounds : null;
} else if (!StackId.persistTaskBounds(stackId)) {
return stack.mBounds;
}
@@ -1551,12 +1569,12 @@
if (stack != null) {
pw.print(prefix); pw.print("stackId="); pw.println(stack.mStackId);
}
- pw.print(prefix); pw.print("hasBeenVisible="); pw.print(hasBeenVisible);
- pw.print(" mResizeable="); pw.print(mResizeable);
- pw.print(" firstActiveTime="); pw.print(lastActiveTime);
- pw.print(" lastActiveTime="); pw.print(lastActiveTime);
- pw.print(" (inactive for ");
- pw.print((getInactiveDuration()/1000)); pw.println("s)");
+ pw.print(prefix + "hasBeenVisible=" + hasBeenVisible);
+ pw.print(" mResizeMode=" + ActivityInfo.resizeModeToString(mResizeMode));
+ pw.print(" isResizeable=" + isResizeable());
+ pw.print(" firstActiveTime=" + lastActiveTime);
+ pw.print(" lastActiveTime=" + lastActiveTime);
+ pw.println(" (inactive for " + (getInactiveDuration() / 1000) + "s)");
}
@Override
diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
index 573afd6..033a243 100644
--- a/services/core/java/com/android/server/input/InputManagerService.java
+++ b/services/core/java/com/android/server/input/InputManagerService.java
@@ -16,7 +16,9 @@
package com.android.server.input;
+import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.util.LocaleList;
import android.view.Display;
import com.android.internal.inputmethod.InputMethodSubtypeHandle;
import com.android.internal.os.SomeArgs;
@@ -780,8 +782,10 @@
|| layout.getProductId() != d.getProductId()) {
return;
}
- for (Locale l : layout.getLocales()) {
- if (isCompatibleLocale(systemLocale, l)) {
+ final LocaleList locales = layout.getLocales();
+ final int numLocales = locales.size();
+ for (int localeIndex = 0; localeIndex < numLocales; ++localeIndex) {
+ if (isCompatibleLocale(systemLocale, locales.get(localeIndex))) {
layouts.add(layout);
break;
}
@@ -799,9 +803,12 @@
final int N = layouts.size();
for (int i = 0; i < N; i++) {
KeyboardLayout layout = layouts.get(i);
- for (Locale l : layout.getLocales()) {
- if (l.getCountry().equals(systemLocale.getCountry())
- && l.getVariant().equals(systemLocale.getVariant())) {
+ final LocaleList locales = layout.getLocales();
+ final int numLocales = locales.size();
+ for (int localeIndex = 0; localeIndex < numLocales; ++localeIndex) {
+ final Locale locale = locales.get(localeIndex);
+ if (locale.getCountry().equals(systemLocale.getCountry())
+ && locale.getVariant().equals(systemLocale.getVariant())) {
return layout.getDescriptor();
}
}
@@ -809,8 +816,11 @@
// Then try an exact match of language and country
for (int i = 0; i < N; i++) {
KeyboardLayout layout = layouts.get(i);
- for (Locale l : layout.getLocales()) {
- if (l.getCountry().equals(systemLocale.getCountry())) {
+ final LocaleList locales = layout.getLocales();
+ final int numLocales = locales.size();
+ for (int localeIndex = 0; localeIndex < numLocales; ++localeIndex) {
+ final Locale locale = locales.get(localeIndex);
+ if (locale.getCountry().equals(systemLocale.getCountry())) {
return layout.getDescriptor();
}
}
@@ -1170,7 +1180,7 @@
0);
String languageTags = a.getString(
com.android.internal.R.styleable.KeyboardLayout_locale);
- Locale[] locales = getLocalesFromLanguageTags(languageTags);
+ LocaleList locales = getLocalesFromLanguageTags(languageTags);
int vid = a.getInt(
com.android.internal.R.styleable.KeyboardLayout_vendorId, -1);
int pid = a.getInt(
@@ -1210,16 +1220,12 @@
}
}
- private static Locale[] getLocalesFromLanguageTags(String languageTags) {
+ @NonNull
+ private static LocaleList getLocalesFromLanguageTags(String languageTags) {
if (TextUtils.isEmpty(languageTags)) {
- return new Locale[0];
+ return LocaleList.getEmptyLocaleList();
}
- String[] tags = languageTags.split("\\|");
- Locale[] locales = new Locale[tags.length];
- for (int i = 0; i < tags.length; i++) {
- locales[i] = Locale.forLanguageTag(tags[i]);
- }
- return locales;
+ return LocaleList.forLanguageTags(languageTags.replace('|', ','));
}
/**
@@ -1596,7 +1602,7 @@
final int accessibilityConfig = Settings.Secure.getIntForUser(
mContext.getContentResolver(), Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON,
0, UserHandle.USER_CURRENT);
- PointerIcon.sUseLargeIcons = (accessibilityConfig == 1);
+ PointerIcon.setUseLargeIcons(accessibilityConfig == 1);
nativeReloadPointerIcons(mPtr);
}
diff --git a/services/core/java/com/android/server/job/controllers/JobStatus.java b/services/core/java/com/android/server/job/controllers/JobStatus.java
index 4113180..be55799 100644
--- a/services/core/java/com/android/server/job/controllers/JobStatus.java
+++ b/services/core/java/com/android/server/job/controllers/JobStatus.java
@@ -255,10 +255,13 @@
* the constraints are satisfied <strong>or</strong> the deadline on the job has expired.
*/
public synchronized boolean isReady() {
- // Deadline constraint trumps other constraints
+ // Deadline constraint trumps other constraints (except for periodic jobs where deadline
+ // (is an implementation detail. A periodic job should only run if it's constraints are
+ // satisfied).
// AppNotIdle implicit constraint trumps all!
return (isConstraintsSatisfied()
- || (hasDeadlineConstraint() && deadlineConstraintSatisfied.get()))
+ || (!job.isPeriodic()
+ && hasDeadlineConstraint() && deadlineConstraintSatisfied.get()))
&& appNotIdleConstraintSatisfied.get();
}
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 492632c..5c77079 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -652,9 +652,9 @@
case ACTION_USER_REMOVED:
case ACTION_USER_ADDED:
synchronized (mRulesLock) {
- // Remove any policies for given user; both cleaning up after a
+ // Remove any persistable state for the given user; both cleaning up after a
// USER_REMOVED, and one last sanity check during USER_ADDED
- removePoliciesForUserLocked(userId);
+ removeUserStateLocked(userId);
// Update global restrict for new user
updateRulesForGlobalChangeLocked(true);
}
@@ -1666,12 +1666,30 @@
}
/**
- * Remove any policies associated with given {@link UserHandle}, persisting
+ * Remove any persistable state associated with given {@link UserHandle}, persisting
* if any changes are made.
*/
- void removePoliciesForUserLocked(int userId) {
- if (LOGV) Slog.v(TAG, "removePoliciesForUserLocked()");
+ void removeUserStateLocked(int userId) {
+ if (LOGV) Slog.v(TAG, "removeUserStateLocked()");
+ boolean writePolicy = false;
+ // Remove entries from restricted background UID whitelist
+ int[] wlUids = new int[0];
+ for (int i = 0; i < mRestrictBackgroundWhitelistUids.size(); i++) {
+ final int uid = mRestrictBackgroundWhitelistUids.keyAt(i);
+ if (UserHandle.getUserId(uid) == userId) {
+ wlUids = appendInt(wlUids, uid);
+ }
+ }
+
+ if (wlUids.length > 0) {
+ for (int uid : wlUids) {
+ removeRestrictBackgroundWhitelistedUidLocked(uid, false);
+ }
+ writePolicy = true;
+ }
+
+ // Remove associated UID policies
int[] uids = new int[0];
for (int i = 0; i < mUidPolicy.size(); i++) {
final int uid = mUidPolicy.keyAt(i);
@@ -1685,6 +1703,10 @@
mUidPolicy.delete(uid);
updateRulesForUidLocked(uid);
}
+ writePolicy = true;
+ }
+
+ if (writePolicy) {
writePolicyLocked();
}
}
@@ -1849,14 +1871,15 @@
mContext.enforceCallingOrSelfPermission(MANAGE_NETWORK_POLICY, TAG);
Slog.i(TAG, "removing uid " + uid + " from restrict background whitelist");
synchronized (mRulesLock) {
- removeRestrictBackgroundWhitelistedUidLocked(uid);
+ removeRestrictBackgroundWhitelistedUidLocked(uid, true);
}
}
- private void removeRestrictBackgroundWhitelistedUidLocked(int uid) {
+ private void removeRestrictBackgroundWhitelistedUidLocked(int uid, boolean writePolicy) {
mRestrictBackgroundWhitelistUids.delete(uid);
- writePolicyLocked();
- // TODO: call other update methods like updateNetworkRulesLocked?
+ if (writePolicy) {
+ writePolicyLocked();
+ }
}
@Override
@@ -2777,7 +2800,7 @@
public void onPackageRemoved(String packageName, int uid) {
if (LOGV) Slog.v(TAG, "onPackageRemoved: " + packageName + " ->" + uid);
synchronized (mRulesLock) {
- removeRestrictBackgroundWhitelistedUidLocked(uid);
+ removeRestrictBackgroundWhitelistedUidLocked(uid, true);
}
}
@@ -2785,7 +2808,7 @@
public void onPackageRemovedAllUsers(String packageName, int uid) {
if (LOGV) Slog.v(TAG, "onPackageRemovedAllUsers: " + packageName + " ->" + uid);
synchronized (mRulesLock) {
- removeRestrictBackgroundWhitelistedUidLocked(uid);
+ removeRestrictBackgroundWhitelistedUidLocked(uid, true);
}
}
}
diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java
index cf876ee..5d97afa 100644
--- a/services/core/java/com/android/server/pm/Installer.java
+++ b/services/core/java/com/android/server/pm/Installer.java
@@ -189,10 +189,6 @@
mInstaller.execute("freecache", uuid, freeStorageSize);
}
- public void moveFiles() throws InstallerException {
- mInstaller.execute("movefiles");
- }
-
/**
* Links the 32 bit native library directory in an application's data
* directory to the real location for backward compatibility. Note that no
diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
index bce7223..4d66e10 100644
--- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java
+++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
@@ -70,8 +70,7 @@
}
static boolean canOptimizePackage(PackageParser.Package pkg) {
- return pkg.canHaveOatDir() &&
- ((pkg.applicationInfo.flags & ApplicationInfo.FLAG_HAS_CODE) != 0);
+ return (pkg.applicationInfo.flags & ApplicationInfo.FLAG_HAS_CODE) != 0;
}
/**
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index d11da79..45455cf 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -76,6 +76,7 @@
import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER;
import static android.system.OsConstants.O_CREAT;
import static android.system.OsConstants.O_RDWR;
+
import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_MANAGED_PROFILE;
import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_PARENT;
import static com.android.internal.content.NativeLibraryHelper.LIB64_DIR_NAME;
@@ -2174,13 +2175,6 @@
scanDirTracedLI(oemAppDir, PackageParser.PARSE_IS_SYSTEM
| PackageParser.PARSE_IS_SYSTEM_DIR, scanFlags, 0);
- if (DEBUG_UPGRADE) Log.v(TAG, "Running installd update commands");
- try {
- mInstaller.moveFiles();
- } catch (InstallerException e) {
- logCriticalInfo(Log.WARN, "Update commands failed: " + e);
- }
-
// Prune any system packages that no longer exist.
final List<String> possiblyDeletedUpdatedSystemApps = new ArrayList<String>();
if (!mOnlyCore) {
@@ -5375,9 +5369,15 @@
int targetUserId = filter.getTargetUserId();
List<ResolveInfo> resultTargetUser = mActivities.queryIntent(intent,
resolvedType, flags, targetUserId);
- if (resultTargetUser != null && !resultTargetUser.isEmpty()
- && isUserEnabled(targetUserId)) {
- return createForwardingResolveInfoUnchecked(filter, sourceUserId, targetUserId);
+ if (resultTargetUser != null && isUserEnabled(targetUserId)) {
+ // If all the matches in the target profile are suspended, return null.
+ for (int i = resultTargetUser.size() - 1; i >= 0; i--) {
+ if ((resultTargetUser.get(i).activityInfo.applicationInfo.flags
+ & ApplicationInfo.FLAG_SUSPENDED) == 0) {
+ return createForwardingResolveInfoUnchecked(filter, sourceUserId,
+ targetUserId);
+ }
+ }
}
return null;
}
@@ -8098,9 +8098,15 @@
}
ps.primaryCpuAbiString = adjustedAbi;
- if (ps.pkg != null && ps.pkg.applicationInfo != null) {
+ if (ps.pkg != null && ps.pkg.applicationInfo != null &&
+ !TextUtils.equals(adjustedAbi, ps.pkg.applicationInfo.primaryCpuAbi)) {
ps.pkg.applicationInfo.primaryCpuAbi = adjustedAbi;
- Slog.i(TAG, "Adjusting ABI for " + ps.name + " to " + adjustedAbi);
+ Slog.i(TAG, "Adjusting ABI for " + ps.name + " to " + adjustedAbi
+ + " (requirer="
+ + (requirer == null ? "null" : requirer.pkg.packageName)
+ + ", scannedPackage="
+ + (scannedPackage != null ? scannedPackage.packageName : "null")
+ + ")");
try {
mInstaller.rmdex(ps.codePathString,
getDexCodeInstructionSet(getPreferredInstructionSet()));
diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index 901749e..43e4b84 100644
--- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
+++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
@@ -863,7 +863,7 @@
if (inPath != null) {
in = new FileInputStream(inPath);
} else {
- in = new SizedInputStream(getInputStream(), sizeBytes);
+ in = new SizedInputStream(getRawInputStream(), sizeBytes);
}
out = session.openWrite(splitName, 0, sizeBytes);
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 0f614ca..4ff7667 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -930,6 +930,7 @@
/** @return a specific user restriction that's in effect currently. */
@Override
public boolean hasUserRestriction(String restrictionKey, int userId) {
+ UserRestrictionsUtils.checkRestriction(restrictionKey);
Bundle restrictions = getEffectiveUserRestrictions(userId);
return restrictions != null && restrictions.getBoolean(restrictionKey);
}
@@ -946,6 +947,7 @@
@Override
public boolean hasBaseUserRestriction(String restrictionKey, int userId) {
checkManageUsersPermission("hasBaseUserRestriction");
+ UserRestrictionsUtils.checkRestriction(restrictionKey);
synchronized (mRestrictionsLock) {
Bundle bundle = mBaseUserRestrictions.get(userId);
return (bundle != null && bundle.getBoolean(restrictionKey, false));
@@ -955,6 +957,7 @@
@Override
public void setUserRestriction(String key, boolean value, int userId) {
checkManageUsersPermission("setUserRestriction");
+ UserRestrictionsUtils.checkRestriction(key);
synchronized (mRestrictionsLock) {
// Note we can't modify Bundles stored in mBaseUserRestrictions directly, so create
// a copy.
diff --git a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
index 87f505d..7ab071f 100644
--- a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
+++ b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
@@ -56,7 +56,15 @@
private UserRestrictionsUtils() {
}
- public static final Set<String> USER_RESTRICTIONS = Sets.newArraySet(
+ private static Set<String> newSetWithUniqueCheck(String[] strings) {
+ final Set<String> ret = Sets.newArraySet(strings);
+
+ // Make sure there's no overlap.
+ Preconditions.checkState(ret.size() == strings.length);
+ return ret;
+ }
+
+ public static final Set<String> USER_RESTRICTIONS = newSetWithUniqueCheck(new String[] {
UserManager.DISALLOW_CONFIG_WIFI,
UserManager.DISALLOW_MODIFY_ACCOUNTS,
UserManager.DISALLOW_INSTALL_APPS,
@@ -94,7 +102,7 @@
UserManager.DISALLOW_RUN_IN_BACKGROUND,
UserManager.DISALLOW_DATA_ROAMING,
UserManager.DISALLOW_SET_USER_ICON
- );
+ });
/**
* Set of user restriction which we don't want to persist.
@@ -140,6 +148,15 @@
UserManager.DISALLOW_UNMUTE_MICROPHONE
);
+ /**
+ * Throws {@link IllegalArgumentException} if the given restriction name is invalid.
+ */
+ public static void checkRestriction(@NonNull String restriction) {
+ if (!USER_RESTRICTIONS.contains(restriction)) {
+ throw new IllegalArgumentException("Unknown restriction: " + restriction);
+ }
+ }
+
public static void writeRestrictions(@NonNull XmlSerializer serializer,
@Nullable Bundle restrictions, @NonNull String tag) throws IOException {
if (restrictions == null) {
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 0b1354a..43b82e9 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -658,6 +658,7 @@
private static final int MSG_POWER_LONG_PRESS = 14;
private static final int MSG_UPDATE_DREAMING_SLEEP_TOKEN = 15;
private static final int MSG_REQUEST_TRANSIENT_BARS = 16;
+ private static final int MSG_REQUEST_TV_PICTURE_IN_PICTURE = 17;
private static final int MSG_REQUEST_TRANSIENT_BARS_ARG_STATUS = 0;
private static final int MSG_REQUEST_TRANSIENT_BARS_ARG_NAVIGATION = 1;
@@ -719,6 +720,9 @@
requestTransientBars(targetBar);
}
break;
+ case MSG_REQUEST_TV_PICTURE_IN_PICTURE:
+ requestTvPictureInPictureInternal();
+ break;
}
}
}
@@ -1337,7 +1341,7 @@
launchAssistAction(null, deviceId);
break;
case LONG_PRESS_HOME_PICTURE_IN_PICTURE:
- handlePipKey(event);
+ requestTvPictureInPicture(event);
break;
default:
Log.w(TAG, "Not defined home long press behavior: " + mLongPressOnHomeBehavior);
@@ -1352,11 +1356,25 @@
}
}
- private void handlePipKey(KeyEvent event) {
- if (DEBUG_INPUT) Log.d(TAG, "handlePipKey event=" + event);
- Intent intent = new Intent(Intent.ACTION_PICTURE_IN_PICTURE_BUTTON);
- intent.putExtra(Intent.EXTRA_KEY_EVENT, event);
- mContext.sendBroadcastAsUser(intent, UserHandle.ALL);
+ private void requestTvPictureInPicture(KeyEvent event) {
+ if (DEBUG_INPUT) Log.d(TAG, "requestTvPictureInPicture event=" + event);
+ mHandler.removeMessages(MSG_REQUEST_TV_PICTURE_IN_PICTURE);
+ Message msg = mHandler.obtainMessage(MSG_REQUEST_TV_PICTURE_IN_PICTURE);
+ msg.setAsynchronous(true);
+ msg.sendToTarget();
+ }
+
+ private void requestTvPictureInPictureInternal() {
+ try {
+ IStatusBarService statusbar = getStatusBarService();
+ if (statusbar != null) {
+ statusbar.requestTvPictureInPicture();
+ }
+ } catch (RemoteException|IllegalArgumentException e) {
+ Slog.e(TAG, "Cannot handle picture-in-picture key", e);
+ // re-acquire status bar service next time it is needed.
+ mStatusBarService = null;
+ }
}
private final Runnable mHomeDoubleTapTimeoutRunnable = new Runnable() {
@@ -1648,14 +1666,16 @@
* eg. Disable long press on home goes to recents on sw600dp.
*/
private void readConfigurationDependentBehaviors() {
- mLongPressOnHomeBehavior = mContext.getResources().getInteger(
+ final Resources res = mContext.getResources();
+
+ mLongPressOnHomeBehavior = res.getInteger(
com.android.internal.R.integer.config_longPressOnHomeBehavior);
if (mLongPressOnHomeBehavior < LONG_PRESS_HOME_NOTHING ||
mLongPressOnHomeBehavior > LAST_LONG_PRESS_HOME_BEHAVIOR) {
mLongPressOnHomeBehavior = LONG_PRESS_HOME_NOTHING;
}
- mDoubleTapOnHomeBehavior = mContext.getResources().getInteger(
+ mDoubleTapOnHomeBehavior = res.getInteger(
com.android.internal.R.integer.config_doubleTapOnHomeBehavior);
if (mDoubleTapOnHomeBehavior < DOUBLE_TAP_HOME_NOTHING ||
mDoubleTapOnHomeBehavior > DOUBLE_TAP_HOME_RECENT_SYSTEM_UI) {
@@ -5337,7 +5357,7 @@
case KeyEvent.KEYCODE_WINDOW: {
if (mShortPressWindowBehavior == SHORT_PRESS_WINDOW_PICTURE_IN_PICTURE) {
if (!down) {
- handlePipKey(event);
+ requestTvPictureInPicture(event);
}
result &= ~ACTION_PASS_TO_USER;
}
diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
index 2a1f46e..9e2ba95 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
@@ -491,6 +491,15 @@
}
@Override
+ public void requestTvPictureInPicture() {
+ if (mBar != null) {
+ try {
+ mBar.requestTvPictureInPicture();
+ } catch (RemoteException ex) {}
+ }
+ }
+
+ @Override
public void setCurrentUser(int newUserId) {
if (SPEW) Slog.d(TAG, "Setting current user to user " + newUserId);
mCurrentUserId = newUserId;
diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
index 578428b..4e96d71 100644
--- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java
+++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
@@ -266,7 +266,7 @@
return (configs.length > 0) ? INPUT_STATE_CONNECTED_STANDBY : INPUT_STATE_DISCONNECTED;
}
- public void addHardwareTvInput(int deviceId, TvInputInfo info) {
+ public void addHardwareInput(int deviceId, TvInputInfo info) {
synchronized (mLock) {
String oldInputId = mHardwareInputIdMap.get(deviceId);
if (oldInputId != null) {
@@ -325,7 +325,7 @@
return false;
}
- public void addHdmiTvInput(int id, TvInputInfo info) {
+ public void addHdmiInput(int id, TvInputInfo info) {
if (info.getType() != TvInputInfo.TYPE_HDMI) {
throw new IllegalArgumentException("info (" + info + ") has non-HDMI type.");
}
@@ -346,7 +346,7 @@
}
}
- public void removeTvInput(String inputId) {
+ public void removeHardwareInput(String inputId) {
synchronized (mLock) {
mInputMap.remove(inputId);
int hardwareIndex = indexOfEqualValue(mHardwareInputIdMap, inputId);
diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java
index 62e7fb4..b065e85 100644
--- a/services/core/java/com/android/server/tv/TvInputManagerService.java
+++ b/services/core/java/com/android/server/tv/TvInputManagerService.java
@@ -71,6 +71,7 @@
import android.os.Process;
import android.os.RemoteException;
import android.os.UserHandle;
+import android.text.TextUtils;
import android.util.Slog;
import android.util.SparseArray;
import android.view.InputChannel;
@@ -310,7 +311,7 @@
userState.serviceStateMap.put(component, serviceState);
updateServiceConnectionLocked(component, userId);
} else {
- inputList.addAll(serviceState.inputList);
+ inputList.addAll(serviceState.hardwareInputList);
}
} else {
try {
@@ -779,15 +780,14 @@
}
}
- private void notifyTvInputInfoChanged(UserState userState, String inputId,
- TvInputInfo inputInfo) {
+ private void setTvInputInfoLocked(UserState userState, TvInputInfo inputInfo) {
if (DEBUG) {
- Slog.d(TAG, "notifyTvInputInfoChanged(inputId=" + inputId + ", inputInfo=" + inputInfo
- + ")");
+ Slog.d(TAG, "setTvInputInfoLocked(inputInfo=" + inputInfo + ")");
}
+ // TODO: Also update the internal input list.
for (ITvInputManagerCallback callback : userState.callbackSet) {
try {
- callback.onTvInputInfoChanged(inputId, inputInfo);
+ callback.onTvInputInfoChanged(inputInfo);
} catch (RemoteException e) {
Slog.e(TAG, "failed to report changed input info to callback", e);
}
@@ -846,6 +846,36 @@
}
}
+ public void setTvInputInfo(TvInputInfo inputInfo, int userId) {
+ String inputInfoPackageName = inputInfo.getServiceInfo().packageName;
+ String callingPackageName = getCallingPackageName();
+ if (!TextUtils.equals(inputInfoPackageName, callingPackageName)) {
+ throw new IllegalArgumentException("calling package " + callingPackageName
+ + " is not allowed to change TvInputInfo for " + inputInfoPackageName);
+ }
+
+ final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(),
+ Binder.getCallingUid(), userId, "setTvInputInfoChanged");
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ synchronized (mLock) {
+ UserState userState = getOrCreateUserStateLocked(resolvedUserId);
+ setTvInputInfoLocked(userState, inputInfo);
+ }
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
+ private String getCallingPackageName() {
+ final String[] packages = mContext.getPackageManager().getPackagesForUid(
+ Binder.getCallingUid());
+ if (packages != null && packages.length > 0) {
+ return packages[0];
+ }
+ return "unknown";
+ }
+
@Override
public int getTvInputState(String inputId, int userId) {
final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(),
@@ -1988,7 +2018,7 @@
private final ServiceConnection connection;
private final ComponentName component;
private final boolean isHardware;
- private final List<TvInputInfo> inputList = new ArrayList<>();
+ private final List<TvInputInfo> hardwareInputList = new ArrayList<>();
private ITvInputService service;
private ServiceCallback callback;
@@ -2185,39 +2215,36 @@
}
}
- private void addTvInputLocked(TvInputInfo inputInfo) {
+ private void addHardwareInputLocked(TvInputInfo inputInfo) {
ServiceState serviceState = getServiceStateLocked(mComponent, mUserId);
- serviceState.inputList.add(inputInfo);
+ serviceState.hardwareInputList.add(inputInfo);
buildTvInputListLocked(mUserId, null);
}
- @Override
- public void addHardwareTvInput(int deviceId, TvInputInfo inputInfo) {
+ public void addHardwareInput(int deviceId, TvInputInfo inputInfo) {
ensureHardwarePermission();
ensureValidInput(inputInfo);
synchronized (mLock) {
- mTvInputHardwareManager.addHardwareTvInput(deviceId, inputInfo);
- addTvInputLocked(inputInfo);
+ mTvInputHardwareManager.addHardwareInput(deviceId, inputInfo);
+ addHardwareInputLocked(inputInfo);
}
}
- @Override
- public void addHdmiTvInput(int id, TvInputInfo inputInfo) {
+ public void addHdmiInput(int id, TvInputInfo inputInfo) {
ensureHardwarePermission();
ensureValidInput(inputInfo);
synchronized (mLock) {
- mTvInputHardwareManager.addHdmiTvInput(id, inputInfo);
- addTvInputLocked(inputInfo);
+ mTvInputHardwareManager.addHdmiInput(id, inputInfo);
+ addHardwareInputLocked(inputInfo);
}
}
- @Override
- public void removeTvInput(String inputId) {
+ public void removeHardwareInput(String inputId) {
ensureHardwarePermission();
synchronized (mLock) {
ServiceState serviceState = getServiceStateLocked(mComponent, mUserId);
boolean removed = false;
- for (Iterator<TvInputInfo> it = serviceState.inputList.iterator();
+ for (Iterator<TvInputInfo> it = serviceState.hardwareInputList.iterator();
it.hasNext(); ) {
if (it.next().getId().equals(inputId)) {
it.remove();
@@ -2227,24 +2254,12 @@
}
if (removed) {
buildTvInputListLocked(mUserId, null);
- mTvInputHardwareManager.removeTvInput(inputId);
+ mTvInputHardwareManager.removeHardwareInput(inputId);
} else {
Slog.e(TAG, "failed to remove input " + inputId);
}
}
}
-
- @Override
- public void setTvInputInfo(String inputId, TvInputInfo inputInfo) {
- ensureValidInput(inputInfo);
- synchronized (mLock) {
- if (DEBUG) {
- Slog.d(TAG, "setTvInputInfo(" + inputInfo + ")");
- }
- UserState userState = getOrCreateUserStateLocked(mUserId);
- notifyTvInputInfoChanged(userState, inputId, inputInfo);
- }
- }
}
private final class SessionCallback extends ITvInputSessionCallback.Stub {
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 39983dd..c7d7096 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -42,6 +42,9 @@
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.UserInfo;
import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.BitmapRegionDecoder;
import android.graphics.Point;
import android.graphics.Rect;
import android.os.Binder;
@@ -71,6 +74,7 @@
import android.view.IWindowManager;
import android.view.WindowManager;
+import java.io.BufferedOutputStream;
import java.io.FileDescriptor;
import java.io.IOException;
import java.io.InputStream;
@@ -96,7 +100,7 @@
public class WallpaperManagerService extends IWallpaperManager.Stub {
static final String TAG = "WallpaperManagerService";
- static final boolean DEBUG = false;
+ static final boolean DEBUG = true;
final Object mLock = new Object[0];
@@ -106,7 +110,8 @@
*/
static final long MIN_WALLPAPER_CRASH_TIME = 10000;
static final int MAX_WALLPAPER_COMPONENT_LOG_LENGTH = 128;
- static final String WALLPAPER = "wallpaper";
+ static final String WALLPAPER = "wallpaper_orig";
+ static final String WALLPAPER_CROP = "wallpaper";
static final String WALLPAPER_INFO = "wallpaper_info.xml";
/**
@@ -120,6 +125,7 @@
final WallpaperData mWallpaper;
final File mWallpaperDir;
final File mWallpaperFile;
+ final File mWallpaperCropFile;
final File mWallpaperInfoFile;
public WallpaperObserver(WallpaperData wallpaper) {
@@ -128,6 +134,7 @@
mWallpaperDir = getWallpaperDir(wallpaper.userId);
mWallpaper = wallpaper;
mWallpaperFile = new File(mWallpaperDir, WALLPAPER);
+ mWallpaperCropFile = new File(mWallpaperDir, WALLPAPER_CROP);
mWallpaperInfoFile = new File(mWallpaperDir, WALLPAPER_INFO);
}
@@ -136,8 +143,10 @@
if (path == null) {
return;
}
+ final boolean written = (event == CLOSE_WRITE || event == MOVED_TO);
+ final File changedFile = new File(mWallpaperDir, path);
+
synchronized (mLock) {
- File changedFile = new File(mWallpaperDir, path);
if (mWallpaperFile.equals(changedFile)
|| mWallpaperInfoFile.equals(changedFile)) {
// changing the wallpaper means we'll need to back up the new one
@@ -148,22 +157,111 @@
}
if (mWallpaperFile.equals(changedFile)) {
notifyCallbacksLocked(mWallpaper);
- final boolean written = (event == CLOSE_WRITE || event == MOVED_TO);
if (mWallpaper.wallpaperComponent == null
|| event != CLOSE_WRITE // includes the MOVED_TO case
|| mWallpaper.imageWallpaperPending) {
if (written) {
+ // The image source has finished writing the source image,
+ // so we now produce the crop rect (in the background), and
+ // only publish the new displayable (sub)image as a result
+ // of that work.
+ generateCrop(mWallpaper);
mWallpaper.imageWallpaperPending = false;
+ if (mWallpaper.setComplete != null) {
+ try {
+ mWallpaper.setComplete.onWallpaperChanged();
+ } catch (RemoteException e) {
+ // if this fails we don't really care; the setting app may just
+ // have crashed and that sort of thing is a fact of life.
+ }
+ }
+ bindWallpaperComponentLocked(mImageWallpaper, true,
+ false, mWallpaper, null);
+ saveSettingsLocked(mWallpaper);
}
- bindWallpaperComponentLocked(mImageWallpaper, true,
- false, mWallpaper, null);
- saveSettingsLocked(mWallpaper);
}
}
}
}
}
+ /**
+ * Once a new wallpaper has been written via setWallpaper(...), it needs to be cropped
+ * for display.
+ */
+ private void generateCrop(WallpaperData wallpaper) {
+ boolean success = false;
+ boolean needCrop = false;
+
+ // Analyse the source; needed in multiple cases
+ BitmapFactory.Options options = new BitmapFactory.Options();
+ options.inJustDecodeBounds = true;
+ BitmapFactory.decodeFile(wallpaper.wallpaperFile.getAbsolutePath(), options);
+
+ // Legacy case uses an empty crop rect here, so we just preserve the
+ // source image verbatim
+ if (!wallpaper.cropHint.isEmpty()) {
+ // ...clamp the crop rect to the measured bounds...
+ wallpaper.cropHint.right = Math.min(wallpaper.cropHint.right, options.outWidth);
+ wallpaper.cropHint.bottom = Math.min(wallpaper.cropHint.bottom, options.outHeight);
+ // ...and don't bother cropping if what we're left with is identity
+ needCrop = (options.outHeight >= wallpaper.cropHint.height()
+ && options.outWidth >= wallpaper.cropHint.width());
+ }
+
+ if (!needCrop) {
+ // Simple case: the nominal crop is at least as big as the source image,
+ // so we take the whole thing and just copy the image file directly.
+ if (DEBUG) {
+ Slog.v(TAG, "Null crop of new wallpaper; copying");
+ }
+ success = FileUtils.copyFile(wallpaper.wallpaperFile, wallpaper.cropFile);
+ if (!success) {
+ wallpaper.cropFile.delete();
+ // TODO: fall back to default wallpaper in this case
+ }
+ } else {
+ // Fancy case: the crop is a subrect of the source
+ FileOutputStream f = null;
+ BufferedOutputStream bos = null;
+ try {
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(
+ wallpaper.wallpaperFile.getAbsolutePath(), false);
+ Bitmap cropped = decoder.decodeRegion(wallpaper.cropHint, null);
+ decoder.recycle();
+
+ if (cropped == null) {
+ Slog.e(TAG, "Could not decode new wallpaper");
+ } else {
+ f = new FileOutputStream(wallpaper.cropFile);
+ bos = new BufferedOutputStream(f, 32*1024);
+ cropped.compress(Bitmap.CompressFormat.PNG, 90, bos);
+ bos.flush(); // don't rely on the implicit flush-at-close when noting success
+ success = true;
+ }
+ } catch (IOException e) {
+ if (DEBUG) {
+ Slog.e(TAG, "I/O error decoding crop: " + e.getMessage());
+ }
+ } finally {
+ IoUtils.closeQuietly(bos);
+ IoUtils.closeQuietly(f);
+ }
+ }
+
+ if (!success) {
+ Slog.e(TAG, "Unable to apply new wallpaper");
+ wallpaper.cropFile.delete();
+ }
+
+ if (wallpaper.cropFile.exists()) {
+ boolean didRestorecon = SELinux.restorecon(wallpaper.cropFile.getAbsoluteFile());
+ if (DEBUG) {
+ Slog.v(TAG, "restorecon() of crop file returned " + didRestorecon);
+ }
+ }
+ }
+
final Context mContext;
final IWindowManager mIWindowManager;
final IPackageManager mIPackageManager;
@@ -191,7 +289,8 @@
int userId;
- File wallpaperFile;
+ final File wallpaperFile;
+ final File cropFile;
/**
* Client is currently writing a new image wallpaper.
@@ -199,6 +298,11 @@
boolean imageWallpaperPending;
/**
+ * Callback once the set + crop is finished
+ */
+ IWallpaperManagerCallback setComplete;
+
+ /**
* Resource name if using a picture from the wallpaper gallery
*/
String name = "";
@@ -232,11 +336,26 @@
int width = -1;
int height = -1;
+ /**
+ * The crop hint supplied for displaying a subset of the source image
+ */
+ final Rect cropHint = new Rect(0, 0, 0, 0);
+
final Rect padding = new Rect(0, 0, 0, 0);
WallpaperData(int userId) {
this.userId = userId;
wallpaperFile = new File(getWallpaperDir(userId), WALLPAPER);
+ cropFile = new File(getWallpaperDir(userId), WALLPAPER_CROP);
+ }
+
+ // Only called in single-threaded boot sequence mode
+ boolean ensureCropExists() {
+ // if the crop file is not present, copy over the source image to use verbatim
+ if (!cropFile.exists()) {
+ return FileUtils.copyFile(wallpaperFile, cropFile);
+ }
+ return true;
}
}
@@ -524,6 +643,9 @@
public void systemRunning() {
if (DEBUG) Slog.v(TAG, "systemReady");
WallpaperData wallpaper = mWallpaperMap.get(UserHandle.USER_SYSTEM);
+ if (!wallpaper.ensureCropExists()) {
+ clearWallpaperLocked(false, UserHandle.USER_SYSTEM, null);
+ }
switchWallpaper(wallpaper, null);
wallpaper.wallpaperObserver = new WallpaperObserver(wallpaper);
wallpaper.wallpaperObserver.startWatching();
@@ -602,6 +724,8 @@
onStoppingUser(userId);
File wallpaperFile = new File(getWallpaperDir(userId), WALLPAPER);
wallpaperFile.delete();
+ File cropFile = new File(getWallpaperDir(userId), WALLPAPER_CROP);
+ cropFile.delete();
File wallpaperInfoFile = new File(getWallpaperDir(userId), WALLPAPER_INFO);
wallpaperInfoFile.delete();
}
@@ -653,9 +777,9 @@
if (wallpaper == null) {
return;
}
- File f = new File(getWallpaperDir(userId), WALLPAPER);
- if (f.exists()) {
- f.delete();
+ if (wallpaper.wallpaperFile.exists()) {
+ wallpaper.wallpaperFile.delete();
+ wallpaper.cropFile.delete();
}
final long ident = Binder.clearCallingIdentity();
try {
@@ -844,11 +968,10 @@
outParams.putInt("height", wallpaper.height);
}
wallpaper.callbacks.register(cb);
- File f = new File(getWallpaperDir(wallpaperUserId), WALLPAPER);
- if (!f.exists()) {
+ if (!wallpaper.cropFile.exists()) {
return null;
}
- return ParcelFileDescriptor.open(f, MODE_READ_ONLY);
+ return ParcelFileDescriptor.open(wallpaper.cropFile, MODE_READ_ONLY);
} catch (FileNotFoundException e) {
/* Shouldn't happen as we check to see if the file exists */
Slog.w(TAG, "Error getting wallpaper", e);
@@ -869,8 +992,8 @@
}
@Override
- public ParcelFileDescriptor setWallpaper(String name, String callingPackage, Bundle extras,
- int which) {
+ public ParcelFileDescriptor setWallpaper(String name, String callingPackage,
+ Rect cropHint, Bundle extras, int which, IWallpaperManagerCallback completion) {
checkPermission(android.Manifest.permission.SET_WALLPAPER);
if (which == 0) {
@@ -881,6 +1004,17 @@
return null;
}
+ // "null" means the no-op crop, preserving the full input image
+ if (cropHint == null) {
+ cropHint = new Rect(0, 0, 0, 0);
+ } else {
+ if (cropHint.isEmpty()
+ || cropHint.left < 0
+ || cropHint.top < 0) {
+ return null;
+ }
+ }
+
synchronized (mLock) {
if (DEBUG) Slog.v(TAG, "setWallpaper");
int userId = UserHandle.getCallingUserId();
@@ -890,6 +1024,8 @@
ParcelFileDescriptor pfd = updateWallpaperBitmapLocked(name, wallpaper, extras);
if (pfd != null) {
wallpaper.imageWallpaperPending = true;
+ wallpaper.setComplete = completion;
+ wallpaper.cropHint.set(cropHint);
}
return pfd;
} finally {
@@ -1196,6 +1332,12 @@
out.attribute(null, "id", Integer.toString(wallpaper.wallpaperId));
out.attribute(null, "width", Integer.toString(wallpaper.width));
out.attribute(null, "height", Integer.toString(wallpaper.height));
+
+ out.attribute(null, "cropLeft", Integer.toString(wallpaper.cropHint.left));
+ out.attribute(null, "cropTop", Integer.toString(wallpaper.cropHint.top));
+ out.attribute(null, "cropRight", Integer.toString(wallpaper.cropHint.right));
+ out.attribute(null, "cropBottom", Integer.toString(wallpaper.cropHint.bottom));
+
if (wallpaper.padding.left != 0) {
out.attribute(null, "paddingLeft", Integer.toString(wallpaper.padding.left));
}
@@ -1208,6 +1350,7 @@
if (wallpaper.padding.bottom != 0) {
out.attribute(null, "paddingBottom", Integer.toString(wallpaper.padding.bottom));
}
+
out.attribute(null, "name", wallpaper.name);
if (wallpaper.wallpaperComponent != null
&& !wallpaper.wallpaperComponent.equals(mImageWallpaper)) {
@@ -1304,6 +1447,10 @@
wallpaper.width = Integer.parseInt(parser.getAttributeValue(null, "width"));
wallpaper.height = Integer.parseInt(parser
.getAttributeValue(null, "height"));
+ wallpaper.cropHint.left = getAttributeInt(parser, "cropLeft", 0);
+ wallpaper.cropHint.top = getAttributeInt(parser, "cropTop", 0);
+ wallpaper.cropHint.right = getAttributeInt(parser, "cropRight", 0);
+ wallpaper.cropHint.bottom = getAttributeInt(parser, "cropBottom", 0);
wallpaper.padding.left = getAttributeInt(parser, "paddingLeft", 0);
wallpaper.padding.top = getAttributeInt(parser, "paddingTop", 0);
wallpaper.padding.right = getAttributeInt(parser, "paddingRight", 0);
@@ -1322,6 +1469,7 @@
if (DEBUG) {
Slog.v(TAG, "mWidth:" + wallpaper.width);
Slog.v(TAG, "mHeight:" + wallpaper.height);
+ Slog.v(TAG, "cropRect:" + wallpaper.cropHint);
Slog.v(TAG, "mName:" + wallpaper.name);
Slog.v(TAG, "mNextWallpaperComponent:"
+ wallpaper.nextWallpaperComponent);
@@ -1348,6 +1496,7 @@
if (!success) {
wallpaper.width = -1;
wallpaper.height = -1;
+ wallpaper.cropHint.set(0, 0, 0, 0);
wallpaper.padding.set(0, 0, 0, 0);
wallpaper.name = "";
} else {
@@ -1368,6 +1517,11 @@
if (wallpaper.height < baseSize) {
wallpaper.height = baseSize;
}
+ // and crop, if not previously specified
+ if (wallpaper.cropHint.width() <= 0
+ || wallpaper.cropHint.height() <= 0) {
+ wallpaper.cropHint.set(0, 0, wallpaper.width, wallpaper.height);
+ }
}
private int getMaximumSizeDimension() {
@@ -1431,6 +1585,7 @@
}
}
+ // Restore the named resource bitmap to both source + crop files
boolean restoreNamedResourceLocked(WallpaperData wallpaper) {
if (wallpaper.name.length() > 4 && "res:".equals(wallpaper.name.substring(0, 4))) {
String resName = wallpaper.name.substring(4);
@@ -1456,6 +1611,7 @@
int resId = -1;
InputStream res = null;
FileOutputStream fos = null;
+ FileOutputStream cos = null;
try {
Context c = mContext.createPackageContext(pkg, Context.CONTEXT_RESTRICTED);
Resources r = c.getResources();
@@ -1469,13 +1625,16 @@
res = r.openRawResource(resId);
if (wallpaper.wallpaperFile.exists()) {
wallpaper.wallpaperFile.delete();
+ wallpaper.cropFile.delete();
}
fos = new FileOutputStream(wallpaper.wallpaperFile);
+ cos = new FileOutputStream(wallpaper.cropFile);
byte[] buffer = new byte[32768];
int amt;
while ((amt=res.read(buffer)) > 0) {
fos.write(buffer, 0, amt);
+ cos.write(buffer, 0, amt);
}
// mWallpaperObserver will notice the close and send the change broadcast
@@ -1491,8 +1650,12 @@
IoUtils.closeQuietly(res);
if (fos != null) {
FileUtils.sync(fos);
- IoUtils.closeQuietly(fos);
}
+ if (cos != null) {
+ FileUtils.sync(cos);
+ }
+ IoUtils.closeQuietly(fos);
+ IoUtils.closeQuietly(cos);
}
}
}
@@ -1520,6 +1683,7 @@
pw.print(wallpaper.width);
pw.print(" mHeight=");
pw.println(wallpaper.height);
+ pw.print(" mCropHint="); pw.println(wallpaper.cropHint);
pw.print(" mPadding="); pw.println(wallpaper.padding);
pw.print(" mName="); pw.println(wallpaper.name);
pw.print(" mWallpaperComponent="); pw.println(wallpaper.wallpaperComponent);
diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java
index 552af03..43a17c9 100644
--- a/services/core/java/com/android/server/wm/AppTransition.java
+++ b/services/core/java/com/android/server/wm/AppTransition.java
@@ -134,7 +134,7 @@
/** Fraction of animation at which the recents thumbnail becomes completely transparent */
private static final float RECENTS_THUMBNAIL_FADEOUT_FRACTION = 0.5f;
- private static final int DEFAULT_APP_TRANSITION_DURATION = 336;
+ static final int DEFAULT_APP_TRANSITION_DURATION = 336;
private static final int THUMBNAIL_APP_TRANSITION_DURATION = 336;
private static final int THUMBNAIL_APP_TRANSITION_ALPHA_DURATION = 336;
private static final long APP_TRANSITION_TIMEOUT_MS = 5000;
diff --git a/services/core/java/com/android/server/wm/AppWindowAnimator.java b/services/core/java/com/android/server/wm/AppWindowAnimator.java
index e046a77..fa5ee72 100644
--- a/services/core/java/com/android/server/wm/AppWindowAnimator.java
+++ b/services/core/java/com/android/server/wm/AppWindowAnimator.java
@@ -339,8 +339,7 @@
return false;
}
- if ((mAppToken.allDrawn || mAppToken.mAnimatingWithSavedSurface
- || animating || mAppToken.startingDisplayed)
+ if ((mAppToken.allDrawn || animating || mAppToken.startingDisplayed)
&& animation != null) {
if (!animating) {
if (DEBUG_ANIM) Slog.v(TAG,
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java
index 2732821..6452fee 100644
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -125,9 +125,6 @@
boolean mLaunchTaskBehind;
boolean mEnteringAnimation;
- // True if the windows associated with this token should be cropped to their stack bounds.
- boolean mCropWindowsToStack;
-
boolean mAlwaysFocusable;
ArrayDeque<Rect> mFrozenBounds = new ArrayDeque<>();
@@ -302,10 +299,10 @@
}
}
- void markSurfacesExiting() {
+ void setWindowsExiting(boolean exiting) {
for (int i = allAppWindows.size() - 1; i >= 0; i--) {
WindowState win = allAppWindows.get(i);
- win.mExiting = true;
+ win.mExiting = exiting;
}
}
@@ -315,11 +312,11 @@
* @return true if the surfaces should be saved, false otherwise.
*/
boolean shouldSaveSurface() {
- // We want to save surface if the app's windows are "allDrawn", or if we're
- // currently animating with save surfaces. (If the app didn't even finish
- // drawing when the user exits, but we have a saved surface from last time,
- // we still want to keep that surface.)
- return allDrawn || mAnimatingWithSavedSurface;
+ // We want to save surface if the app's windows are "allDrawn".
+ // (If we started entering animation early with saved surfaces, allDrawn
+ // should have been restored to true. So we'll save again in that case
+ // even if app didn't actually finish drawing.)
+ return allDrawn;
}
boolean hasSavedSurface() {
@@ -337,13 +334,26 @@
return;
}
mAnimatingWithSavedSurface = true;
+
+ // Check if we have enough drawn windows to mark allDrawn= true.
+ int numInteresting = 0;
+ int numDrawn = 0;
for (int i = windows.size() - 1; i >= 0; i--) {
- WindowState ws = windows.get(i);
- ws.restoreSavedSurface();
+ WindowState w = windows.get(i);
+ w.restoreSavedSurface();
+ if (w != startingWindow && !w.mAppDied
+ && (!mAppAnimator.freezingScreen || !w.mAppFreezing)) {
+ numInteresting++;
+ if (w.isDrawnLw()) {
+ numDrawn++;
+ }
+ }
}
- // Mark the app allDrawn since it must be allDrawn at the time
- // it was first saved.
- allDrawn = true;
+
+ allDrawn |= (numInteresting == numDrawn);
+
+ if (DEBUG_APP_TRANSITIONS || DEBUG_ANIM) Slog.d(TAG,
+ "restoreSavedSurfaces: " + appWindowToken + " allDrawn=" + allDrawn);
}
void destroySavedSurfaces() {
@@ -351,6 +361,7 @@
WindowState win = windows.get(i);
win.destroySavedSurface();
}
+ mAnimatingWithSavedSurface = false;
}
@Override
diff --git a/services/core/java/com/android/server/wm/BoundsAnimationController.java b/services/core/java/com/android/server/wm/BoundsAnimationController.java
new file mode 100644
index 0000000..5f97478
--- /dev/null
+++ b/services/core/java/com/android/server/wm/BoundsAnimationController.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm;
+
+import static com.android.server.wm.AppTransition.DEFAULT_APP_TRANSITION_DURATION;
+import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM;
+import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
+import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
+
+import android.animation.Animator;
+import android.animation.ValueAnimator;
+import android.graphics.Rect;
+import android.util.ArrayMap;
+import android.util.Slog;
+import android.view.animation.LinearInterpolator;
+
+/**
+ * Enables animating bounds of objects.
+ *
+ * In multi-window world bounds of both stack and tasks can change. When we need these bounds to
+ * change smoothly and not require the app to relaunch (e.g. because it handles resizes and
+ * relaunching it would cause poorer experience), these class provides a way to directly animate
+ * the bounds of the resized object.
+ *
+ * The object that is resized needs to implement {@link AnimateBoundsUser} interface.
+ */
+public class BoundsAnimationController {
+ private static final String TAG = TAG_WITH_CLASS_NAME ? "BoundsAnimationController" : TAG_WM;
+
+ // Only acccessed on UI thread.
+ private ArrayMap<AnimateBoundsUser, BoundsAnimator> mRunningAnimations = new ArrayMap<>();
+
+ private final class BoundsAnimator extends ValueAnimator
+ implements ValueAnimator.AnimatorUpdateListener, ValueAnimator.AnimatorListener {
+ private final AnimateBoundsUser mTarget;
+ private final Rect mFrom;
+ private final Rect mTo;
+ private final Rect mTmpRect;
+
+ BoundsAnimator(AnimateBoundsUser target, Rect from, Rect to) {
+ super();
+ mTarget = target;
+ mFrom = from;
+ mTo = to;
+ mTmpRect = new Rect();
+ addUpdateListener(this);
+ addListener(this);
+ }
+
+ @Override
+ public void onAnimationUpdate(ValueAnimator animation) {
+ final float value = (Float) animation.getAnimatedValue();
+ final float remains = 1 - value;
+ mTmpRect.left = (int) (mFrom.left * remains + mTo.left * value);
+ mTmpRect.top = (int) (mFrom.top * remains + mTo.top * value);
+ mTmpRect.right = (int) (mFrom.right * remains + mTo.right * value);
+ mTmpRect.bottom = (int) (mFrom.bottom * remains + mTo.bottom * value);
+ if (DEBUG_ANIM) Slog.d(TAG, "animateUpdate: mTarget=" + mTarget + ", mBounds="
+ + mTmpRect + ", from=" + mFrom + ", mTo=" + mTo + ", value=" + value
+ + ", remains=" + remains);
+ if (!mTarget.setSize(mTmpRect)) {
+ // Whoops, the target doesn't feel like animating anymore. Let's immediately finish
+ // any further animation.
+ animation.cancel();
+ }
+ }
+
+
+ @Override
+ public void onAnimationStart(Animator animation) {
+
+ }
+
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ finishAnimation();
+ }
+
+ @Override
+ public void onAnimationCancel(Animator animation) {
+ finishAnimation();
+ }
+
+ private void finishAnimation() {
+ mTarget.finishBoundsAnimation();
+ removeListener(this);
+ removeUpdateListener(this);
+ mRunningAnimations.remove(mTarget);
+ }
+
+ @Override
+ public void onAnimationRepeat(Animator animation) {
+
+ }
+ }
+
+ public interface AnimateBoundsUser {
+ /**
+ * Asks the target to directly (without any intermediate steps, like scheduling animation)
+ * resize its bounds.
+ *
+ * @return Whether the target still wants to be animated and successfully finished the
+ * operation. If it returns false, the animation will immediately be cancelled. The target
+ * should return false when something abnormal happened, e.g. it was completely removed
+ * from the hierarchy and is not valid anymore.
+ */
+ boolean setSize(Rect bounds);
+
+ /**
+ * Callback for the target to inform it that the animation is finished, so it can do some
+ * necessary cleanup.
+ */
+ void finishBoundsAnimation();
+ }
+
+ void animateBounds(AnimateBoundsUser target, Rect from, Rect to) {
+ final BoundsAnimator existing = mRunningAnimations.get(target);
+ if (existing != null) {
+ existing.cancel();
+ }
+ BoundsAnimator animator = new BoundsAnimator(target, from, to);
+ mRunningAnimations.put(target, animator);
+ animator.setFloatValues(0f, 1f);
+ animator.setDuration(DEFAULT_APP_TRANSITION_DURATION);
+ animator.setInterpolator(new LinearInterpolator());
+ animator.start();
+ }
+}
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index d9667a1..c542ff6 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -19,8 +19,11 @@
import static android.app.ActivityManager.StackId.DOCKED_STACK_ID;
import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID;
import static android.app.ActivityManager.StackId.HOME_STACK_ID;
+import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE;
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
import static android.app.ActivityManager.RESIZE_MODE_SYSTEM_SCREEN_ROTATION;
+import static android.content.pm.ActivityInfo.RESIZE_MODE_CROP_WINDOWS;
+import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_RESIZE;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_STACK;
@@ -32,6 +35,7 @@
import static android.view.WindowManager.DOCKED_TOP;
import android.app.ActivityManager.StackId;
+import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.graphics.Rect;
import android.util.EventLog;
@@ -39,12 +43,14 @@
import android.view.DisplayInfo;
import android.view.Surface;
+import com.android.internal.R;
import com.android.server.EventLogTags;
import java.io.PrintWriter;
import java.util.ArrayList;
class Task implements DimLayer.DimLayerUser {
+ static final String TAG = TAG_WITH_CLASS_NAME ? "Task" : TAG_WM;
// Return value from {@link setBounds} indicating no change was made to the Task bounds.
static final int BOUNDS_CHANGE_NONE = 0;
// Return value from {@link setBounds} indicating the position of the Task bounds changed.
@@ -84,8 +90,8 @@
// For handling display rotations.
private Rect mTmpRect2 = new Rect();
- // Whether the task is resizeable
- private boolean mResizeable;
+ // Resize mode of the task. See {@link ActivityInfo#resizeMode}
+ private int mResizeMode;
// Whether we need to show toast about the app being non-resizeable when it becomes visible.
// This flag is set when a non-resizeable task is docked (or side-by-side). It's cleared
@@ -95,6 +101,8 @@
// Whether the task is currently being drag-resized
private boolean mDragResizing;
+ private boolean mHomeTask;
+
Task(int taskId, TaskStack stack, int userId, WindowManagerService service, Rect bounds,
Configuration config) {
mTaskId = taskId;
@@ -125,38 +133,54 @@
mShowNonResizeableDockToast = false;
+ if (isResizeable()) {
+ Slog.wtf(TAG,
+ "Trying to show non-resizeable toast when task is resizeable task=" + this);
+ return;
+ }
+
+ if (mResizeMode == RESIZE_MODE_UNRESIZEABLE) {
+ final String text =
+ mService.mContext.getString(R.string.dock_non_resizeble_failed_to_dock_text);
+ mService.mH.obtainMessage(SHOW_NON_RESIZEABLE_DOCK_TOAST, 0, 0, text).sendToTarget();
+ return;
+ }
+
final int dockSide = mStack.getDockSide();
+ if (!inCropWindowsResizeMode() || dockSide == DOCKED_INVALID) {
+ return;
+ }
+
int xOffset = 0;
int yOffset = 0;
- if (dockSide != DOCKED_INVALID) {
- mStack.getBounds(mTmpRect);
+ mStack.getBounds(mTmpRect);
- if (dockSide == DOCKED_LEFT || dockSide == DOCKED_RIGHT) {
- // The toast was originally placed at the bottom and centered. To place it
- // at the bottom-center of the stack, we offset it horizontally by the diff
- // between the center of the stack bounds vs. the center of the screen.
- displayContent.getLogicalDisplayRect(mTmpRect2);
- xOffset = mTmpRect.centerX() - mTmpRect2.centerX();
- } else if (dockSide == DOCKED_TOP) {
- // The toast was originally placed at the bottom and centered. To place it
- // at the bottom center of the top stack, we offset it vertically by the diff
- // between the bottom of the stack bounds vs. the bottom of the content rect.
- //
- // Note here we use the content rect instead of the display rect, as we want
- // the toast's distance to the dock divider (when it's placed at the top half)
- // to be the same as it's distance to the top of the navigation bar (when it's
- // placed at the bottom).
+ if (dockSide == DOCKED_LEFT || dockSide == DOCKED_RIGHT) {
+ // The toast was originally placed at the bottom and centered. To place it at the
+ // bottom-center of the stack, we offset it horizontally by the diff between the center
+ // of the stack bounds vs. the center of the screen.
+ displayContent.getLogicalDisplayRect(mTmpRect2);
+ xOffset = mTmpRect.centerX() - mTmpRect2.centerX();
+ } else if (dockSide == DOCKED_TOP) {
+ // The toast was originally placed at the bottom and centered. To place it at the bottom
+ // center of the top stack, we offset it vertically by the diff between the bottom of
+ // the stack bounds vs. the bottom of the content rect.
+ //
+ // Note here we use the content rect instead of the display rect, as we want the toast's
+ // distance to the dock divider (when it's placed at the top half) to be the same as
+ // it's distance to the top of the navigation bar (when it's placed at the bottom).
- // We don't adjust for DOCKED_BOTTOM case since it's already at the bottom.
- displayContent.getContentRect(mTmpRect2);
- yOffset = mTmpRect2.bottom - mTmpRect.bottom;
- }
- mService.mH.obtainMessage(
- SHOW_NON_RESIZEABLE_DOCK_TOAST, xOffset, yOffset).sendToTarget();
+ // We don't adjust for DOCKED_BOTTOM case since it's already at the bottom.
+ displayContent.getContentRect(mTmpRect2);
+ yOffset = mTmpRect2.bottom - mTmpRect.bottom;
}
+ final String text =
+ mService.mContext.getString(R.string.dock_cropped_windows_text);
+ mService.mH.obtainMessage(SHOW_NON_RESIZEABLE_DOCK_TOAST,
+ xOffset, yOffset, text).sendToTarget();
}
- void addAppToken(int addPos, AppWindowToken wtoken) {
+ void addAppToken(int addPos, AppWindowToken wtoken, int resizeMode, boolean homeTask) {
final int lastPos = mAppTokens.size();
if (addPos >= lastPos) {
addPos = lastPos;
@@ -171,6 +195,8 @@
mAppTokens.add(addPos, wtoken);
wtoken.mTask = this;
mDeferRemoval = false;
+ mResizeMode = resizeMode;
+ mHomeTask = homeTask;
}
private boolean hasAppTokensAlive() {
@@ -184,11 +210,11 @@
void removeLocked() {
if (hasAppTokensAlive() && mStack.isAnimating()) {
- if (DEBUG_STACK) Slog.i(TAG_WM, "removeTask: deferring removing taskId=" + mTaskId);
+ if (DEBUG_STACK) Slog.i(TAG, "removeTask: deferring removing taskId=" + mTaskId);
mDeferRemoval = true;
return;
}
- if (DEBUG_STACK) Slog.i(TAG_WM, "removeTask: removing taskId=" + mTaskId);
+ if (DEBUG_STACK) Slog.i(TAG, "removeTask: removing taskId=" + mTaskId);
EventLog.writeEvent(EventLogTags.WM_TASK_REMOVED, mTaskId, "removeTask");
mDeferRemoval = false;
DisplayContent content = getDisplayContent();
@@ -203,7 +229,7 @@
if (stack == mStack) {
return;
}
- if (DEBUG_STACK) Slog.i(TAG_WM, "moveTaskToStack: removing taskId=" + mTaskId
+ if (DEBUG_STACK) Slog.i(TAG, "moveTaskToStack: removing taskId=" + mTaskId
+ " from stack=" + mStack);
EventLog.writeEvent(EventLogTags.WM_TASK_REMOVED, mTaskId, "moveTask");
if (mStack != null) {
@@ -214,7 +240,7 @@
void positionTaskInStack(TaskStack stack, int position, Rect bounds, Configuration config) {
if (mStack != null && stack != mStack) {
- if (DEBUG_STACK) Slog.i(TAG_WM, "positionTaskInStack: removing taskId=" + mTaskId
+ if (DEBUG_STACK) Slog.i(TAG, "positionTaskInStack: removing taskId=" + mTaskId
+ " from stack=" + mStack);
EventLog.writeEvent(EventLogTags.WM_TASK_REMOVED, mTaskId, "moveTask");
mStack.removeTask(this);
@@ -319,12 +345,21 @@
out.set(mTempInsetBounds);
}
- void setResizeable(boolean resizeable) {
- mResizeable = resizeable;
+ void setResizeable(int resizeMode) {
+ mResizeMode = resizeMode;
}
boolean isResizeable() {
- return mResizeable;
+ return !mHomeTask
+ && (ActivityInfo.isResizeableMode(mResizeMode) || mService.mForceResizableTasks);
+ }
+
+ boolean cropWindowsToStackBounds() {
+ return !mHomeTask && (isResizeable() || mResizeMode == RESIZE_MODE_CROP_WINDOWS);
+ }
+
+ private boolean inCropWindowsResizeMode() {
+ return !mHomeTask && !isResizeable() && mResizeMode == RESIZE_MODE_CROP_WINDOWS;
}
boolean resizeLocked(Rect bounds, Configuration configuration, boolean forced) {
@@ -551,7 +586,7 @@
for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {
final WindowState win = windows.get(winNdx);
if (!resizingWindows.contains(win)) {
- if (DEBUG_RESIZE) Slog.d(TAG_WM, "resizeWindows: Resizing " + win);
+ if (DEBUG_RESIZE) Slog.d(TAG, "resizeWindows: Resizing " + win);
resizingWindows.add(win);
}
}
@@ -563,7 +598,7 @@
final ArrayList<WindowState> windows = mAppTokens.get(activityNdx).allAppWindows;
for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {
final WindowState win = windows.get(winNdx);
- if (DEBUG_RESIZE) Slog.d(TAG_WM, "moveWindows: Moving " + win);
+ if (DEBUG_RESIZE) Slog.d(TAG, "moveWindows: Moving " + win);
win.mMovedByResize = true;
}
}
@@ -619,7 +654,7 @@
}
boolean isTwoFingerScrollMode() {
- return isDockedInEffect() && !isResizeable();
+ return inCropWindowsResizeMode() && isDockedInEffect();
}
WindowState getTopVisibleAppMainWindow() {
diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java
index f02e49e..e6fa837 100644
--- a/services/core/java/com/android/server/wm/TaskStack.java
+++ b/services/core/java/com/android/server/wm/TaskStack.java
@@ -20,6 +20,7 @@
import android.content.res.Configuration;
import android.graphics.Rect;
import android.os.Debug;
+import android.os.RemoteException;
import android.util.EventLog;
import android.util.Slog;
import android.util.SparseArray;
@@ -47,7 +48,8 @@
import static com.android.server.wm.WindowManagerService.H.RESIZE_STACK;
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
-public class TaskStack implements DimLayer.DimLayerUser {
+public class TaskStack implements DimLayer.DimLayerUser,
+ BoundsAnimationController.AnimateBoundsUser {
// If the stack should be resized to fullscreen.
private static final boolean FULLSCREEN = true;
@@ -72,6 +74,12 @@
/** Content limits relative to the DisplayContent this sits in. */
private Rect mBounds = new Rect();
+ /** Screen content area excluding IM windows, etc. */
+ private final Rect mContentBounds = new Rect();
+
+ /** Stack bounds adjusted to screen content area (taking into account IM windows, etc.) */
+ private final Rect mAdjustedBounds = new Rect();
+
/** Whether mBounds is fullscreen */
private boolean mFullscreen = true;
@@ -162,6 +170,85 @@
return mTmpRect.equals(bounds);
}
+ void alignTasksToAdjustedBounds(final Rect adjustedBounds) {
+ if (mFullscreen) {
+ return;
+ }
+ // Update bounds of containing tasks.
+ for (int taskNdx = mTasks.size() - 1; taskNdx >= 0; --taskNdx) {
+ final Task task = mTasks.get(taskNdx);
+ if (task.isTwoFingerScrollMode()) {
+ // If we're scrolling we don't care about your bounds or configs,
+ // they should be null as if we were in fullscreen.
+ task.resizeLocked(null, null, false /* forced */);
+ task.getBounds(mTmpRect2);
+ task.scrollLocked(mTmpRect2);
+ } else if (task.isResizeable()) {
+ task.getBounds(mTmpRect2);
+ mTmpRect2.offsetTo(adjustedBounds.left, adjustedBounds.top);
+ task.resizeLocked(mTmpRect2, task.mOverrideConfig, false /* forced */);
+ }
+ }
+ }
+
+ void adjustForIME(final WindowState imeWin) {
+ final int dockedSide = getDockSide();
+ final boolean dockedTopOrBottom = dockedSide == DOCKED_TOP || dockedSide == DOCKED_BOTTOM;
+ final Rect adjustedBounds = mAdjustedBounds;
+ if (imeWin == null || !dockedTopOrBottom) {
+ // If mContentBounds is already empty, it means we're not applying
+ // any adjustments, so nothing to do; otherwise clear any adjustments.
+ if (!mContentBounds.isEmpty()) {
+ mContentBounds.setEmpty();
+ adjustedBounds.set(mBounds);
+ alignTasksToAdjustedBounds(adjustedBounds);
+ }
+ return;
+ }
+
+ final Rect displayContentRect = mTmpRect;
+ final Rect contentBounds = mTmpRect2;
+
+ // Calculate the content bounds excluding the area occupied by IME
+ mDisplayContent.getContentRect(displayContentRect);
+ contentBounds.set(displayContentRect);
+ int imeTop = Math.max(imeWin.getDisplayFrameLw().top, contentBounds.top);
+ imeTop += imeWin.getGivenContentInsetsLw().top;
+ if (contentBounds.bottom > imeTop) {
+ contentBounds.bottom = imeTop;
+ }
+
+ // If content bounds not changing, nothing to do.
+ if (mContentBounds.equals(contentBounds)) {
+ return;
+ }
+
+ // Content bounds changed, need to apply adjustments depending on dock sides.
+ mContentBounds.set(contentBounds);
+ adjustedBounds.set(mBounds);
+ final int yOffset = displayContentRect.bottom - contentBounds.bottom;
+
+ if (dockedSide == DOCKED_TOP) {
+ // If this stack is docked on top, we make it smaller so the bottom stack is not
+ // occluded by IME. We shift its bottom up by the height of the IME (capped by
+ // the display content rect). Note that we don't change the task bounds.
+ adjustedBounds.bottom = Math.max(
+ adjustedBounds.bottom - yOffset, displayContentRect.top);
+ } else {
+ // If this stack is docked on bottom, we shift it up so that it's not occluded by
+ // IME. We try to move it up by the height of the IME window (although the best
+ // we could do is to make the top stack fully collapsed).
+ final int dividerWidth = mDisplayContent.mDividerControllerLocked.getContentWidth();
+ adjustedBounds.top = Math.max(
+ adjustedBounds.top - yOffset, displayContentRect.top + dividerWidth);
+ adjustedBounds.bottom = adjustedBounds.top + mBounds.height();
+
+ // We also move the member tasks together, taking care not to resize them.
+ // Resizing might cause relaunch, and IME window may not come back after that.
+ alignTasksToAdjustedBounds(adjustedBounds);
+ }
+ }
+
private boolean setBounds(Rect bounds) {
boolean oldFullscreen = mFullscreen;
int rotation = Surface.ROTATION_0;
@@ -191,6 +278,16 @@
mBounds.set(bounds);
mRotation = rotation;
+
+ // Clear the adjusted content bounds as they're no longer valid.
+ // If IME is still visible, these will be re-applied.
+ // Note that we don't clear mContentBounds here, so that we know the last IME
+ // adjust we applied.
+ // If user starts dragging the dock divider while IME is visible, the new bounds
+ // we received are based on the actual screen location of the divider. It already
+ // accounted for the IME window, so we don't want to adjust again.
+ mAdjustedBounds.set(mBounds);
+
return true;
}
@@ -215,9 +312,14 @@
public void getBounds(Rect out) {
if (useCurrentBounds()) {
- // No need to adjust the output bounds if fullscreen or the docked stack is visible
+ // If we're currently adjusting for IME, we use the adjusted bounds; otherwise,
+ // no need to adjust the output bounds if fullscreen or the docked stack is visible
// since it is already what we want to represent to the rest of the system.
- out.set(mBounds);
+ if (!mContentBounds.isEmpty()) {
+ out.set(mAdjustedBounds);
+ } else {
+ out.set(mBounds);
+ }
return;
}
@@ -804,4 +906,32 @@
}
return false;
}
+
+ @Override // AnimatesBounds
+ public boolean setSize(Rect bounds) {
+ synchronized (mService.mWindowMap) {
+ if (mDisplayContent == null) {
+ return false;
+ }
+ }
+ try {
+ mService.mActivityManager.resizeStack(mStackId, bounds, false, true, false);
+ } catch (RemoteException e) {
+ }
+ return true;
+ }
+
+ @Override // AnimatesBounds
+ public void finishBoundsAnimation() {
+ synchronized (mService.mWindowMap) {
+ if (mTasks.isEmpty()) {
+ return;
+ }
+ final Task task = mTasks.get(mTasks.size() - 1);
+ if (task != null) {
+ task.setDragResizing(false);
+ mService.requestTraversal();
+ }
+ }
+ }
}
diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java
index 722c3b4..8d2fb9b 100644
--- a/services/core/java/com/android/server/wm/WindowAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowAnimator.java
@@ -428,7 +428,7 @@
final AppWindowToken atoken = win.mAppToken;
if (winAnimator.mDrawState == WindowStateAnimator.READY_TO_SHOW) {
- if (atoken == null || atoken.allDrawn || atoken.mAnimatingWithSavedSurface) {
+ if (atoken == null || atoken.allDrawn) {
if (winAnimator.performShowLocked()) {
setPendingLayoutChanges(displayId,
WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM);
diff --git a/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java b/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java
index 0979cd3..66aa863 100644
--- a/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java
+++ b/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java
@@ -35,10 +35,10 @@
static final boolean DEBUG_RESIZE = false;
static final boolean DEBUG = false;
- static final boolean DEBUG_ADD_REMOVE = false;
+ static final boolean DEBUG_ADD_REMOVE = true;
static final boolean DEBUG_FOCUS = false;
static final boolean DEBUG_FOCUS_LIGHT = DEBUG_FOCUS || false;
- static final boolean DEBUG_ANIM = false;
+ static final boolean DEBUG_ANIM = true;
static final boolean DEBUG_KEYGUARD = false;
static final boolean DEBUG_LAYOUT = false;
static final boolean DEBUG_LAYERS = false;
@@ -50,7 +50,7 @@
static final boolean DEBUG_ORIENTATION = false;
static final boolean DEBUG_APP_ORIENTATION = false;
static final boolean DEBUG_CONFIGURATION = false;
- static final boolean DEBUG_APP_TRANSITIONS = false;
+ static final boolean DEBUG_APP_TRANSITIONS = true;
static final boolean DEBUG_STARTING_WINDOW = false;
static final boolean DEBUG_WALLPAPER = false;
static final boolean DEBUG_WALLPAPER_LIGHT = false || DEBUG_WALLPAPER;
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 93a1015..e7aba6d 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -114,7 +114,6 @@
import android.view.animation.Animation;
import android.view.inputmethod.InputMethodManagerInternal;
import android.widget.Toast;
-
import com.android.internal.R;
import com.android.internal.app.IAssistScreenshotReceiver;
import com.android.internal.os.IResultReceiver;
@@ -157,9 +156,11 @@
import static android.app.ActivityManager.DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT;
import static android.app.ActivityManager.StackId.DOCKED_STACK_ID;
import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID;
+import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
import static android.app.StatusBarManager.DISABLE_MASK;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
+import static android.view.WindowManager.DOCKED_BOTTOM;
import static android.view.WindowManager.DOCKED_INVALID;
import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW;
import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW;
@@ -218,8 +219,8 @@
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WALLPAPER_LIGHT;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WINDOW_MOVEMENT;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WINDOW_TRACE;
-import static com.android.server.wm.WindowManagerDebugConfig.SHOW_STACK_CRAWLS;
import static com.android.server.wm.WindowManagerDebugConfig.SHOW_LIGHT_TRANSACTIONS;
+import static com.android.server.wm.WindowManagerDebugConfig.SHOW_STACK_CRAWLS;
import static com.android.server.wm.WindowManagerDebugConfig.SHOW_SURFACE_ALLOC;
import static com.android.server.wm.WindowManagerDebugConfig.SHOW_TRANSACTIONS;
import static com.android.server.wm.WindowManagerDebugConfig.SHOW_VERBOSE_TRANSACTIONS;
@@ -490,6 +491,8 @@
private final SparseIntArray mTmpTaskIds = new SparseIntArray();
+ boolean mForceResizableTasks = false;
+
int getDragLayerLocked() {
return mPolicy.windowTypeToLayerLw(LayoutParams.TYPE_DRAG) * TYPE_LAYER_MULTIPLIER
+ TYPE_LAYER_OFFSET;
@@ -643,6 +646,9 @@
final WindowAnimator mAnimator;
+ private final BoundsAnimationController mBoundsAnimationController =
+ new BoundsAnimationController();
+
SparseArray<Task> mTaskIdToTask = new SparseArray<>();
/** All of the TaskStacks in the window manager, unordered. For an ordered list call
@@ -1887,6 +1893,12 @@
+ attrs.token + ". Aborting.");
return WindowManagerGlobal.ADD_BAD_APP_TOKEN;
}
+ } else if (type == TYPE_QS_DIALOG) {
+ if (token.windowType != TYPE_QS_DIALOG) {
+ Slog.w(TAG_WM, "Attempted to add QS dialog window with bad token "
+ + attrs.token + ". Aborting.");
+ return WindowManagerGlobal.ADD_BAD_APP_TOKEN;
+ }
} else if (token.appWindowToken != null) {
Slog.w(TAG_WM, "Non-null appWindowToken for system window of type=" + type);
// It is not valid to use an app token with other system types; we will
@@ -2679,7 +2691,17 @@
} else {
winAnimator.mEnterAnimationPending = false;
winAnimator.mEnteringAnimation = false;
- if (winAnimator.hasSurface() && !win.mExiting) {
+ final boolean usingSavedSurfaceBeforeVisible =
+ oldVisibility != View.VISIBLE && win.isAnimatingWithSavedSurface();
+ if (DEBUG_APP_TRANSITIONS || DEBUG_ANIM) {
+ if (winAnimator.hasSurface() && !win.mExiting
+ && usingSavedSurfaceBeforeVisible) {
+ Slog.d(TAG, "Ignoring layout to invisible when using saved surface " + win);
+ }
+ }
+
+ if (winAnimator.hasSurface() && !win.mExiting
+ && !usingSavedSurfaceBeforeVisible) {
if (DEBUG_VISIBILITY) Slog.i(TAG_WM, "Relayout invis " + win
+ ": mExiting=" + win.mExiting);
// If we are not currently running the exit animation, we
@@ -2848,11 +2870,12 @@
if ((result & WindowManagerGlobal.RELAYOUT_RES_FIRST_TIME) != 0) {
win.prepareWindowToDisplayDuringRelayout(outConfig);
}
- if ((attrChanges& LayoutParams.FORMAT_CHANGED) != 0) {
- // If the format can be changed in place yaay!
- // If not, fall back to a surface re-build
+ if ((attrChanges & LayoutParams.FORMAT_CHANGED) != 0) {
+ // If the format can't be changed in place, preserve the old surface until the app draws
+ // on the new one. This prevents blinking when we change elevation of freeform and
+ // pinned windows.
if (!winAnimator.tryChangeFormatInPlaceLocked()) {
- winAnimator.destroySurfaceLocked();
+ winAnimator.preserveSurfaceLocked();
result |= RELAYOUT_RES_SURFACE_CHANGED
| WindowManagerGlobal.RELAYOUT_RES_FIRST_TIME;
}
@@ -3208,8 +3231,8 @@
public void addAppToken(int addPos, IApplicationToken token, int taskId, int stackId,
int requestedOrientation, boolean fullscreen, boolean showForAllUsers, int userId,
int configChanges, boolean voiceInteraction, boolean launchTaskBehind,
- Rect taskBounds, Configuration config, boolean cropWindowsToStack,
- boolean alwaysFocusable) {
+ Rect taskBounds, Configuration config, int taskResizeMode, boolean alwaysFocusable,
+ boolean homeTask) {
if (!checkCallingPermission(android.Manifest.permission.MANAGE_APP_TOKENS,
"addAppToken()")) {
throw new SecurityException("Requires MANAGE_APP_TOKENS permission");
@@ -3243,7 +3266,6 @@
atoken.layoutConfigChanges = (configChanges &
(ActivityInfo.CONFIG_SCREEN_SIZE | ActivityInfo.CONFIG_ORIENTATION)) != 0;
atoken.mLaunchTaskBehind = launchTaskBehind;
- atoken.mCropWindowsToStack = cropWindowsToStack;
atoken.mAlwaysFocusable = alwaysFocusable;
if (DEBUG_TOKEN_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(TAG_WM, "addAppToken: " + atoken
+ " to stack=" + stackId + " task=" + taskId + " at " + addPos);
@@ -3252,7 +3274,7 @@
if (task == null) {
task = createTaskLocked(taskId, stackId, userId, atoken, taskBounds, config);
}
- task.addAppToken(addPos, atoken);
+ task.addAppToken(addPos, atoken, taskResizeMode, homeTask);
mTokenMap.put(token.asBinder(), atoken);
@@ -3263,8 +3285,8 @@
}
@Override
- public void setAppTask(
- IBinder token, int taskId, int stackId, Rect taskBounds, Configuration config) {
+ public void setAppTask(IBinder token, int taskId, int stackId, Rect taskBounds,
+ Configuration config, int taskResizeMode, boolean homeTask) {
if (!checkCallingPermission(android.Manifest.permission.MANAGE_APP_TOKENS,
"setAppTask()")) {
throw new SecurityException("Requires MANAGE_APP_TOKENS permission");
@@ -3284,7 +3306,7 @@
newTask = createTaskLocked(
taskId, stackId, oldTask.mUserId, atoken, taskBounds, config);
}
- newTask.addAppToken(Integer.MAX_VALUE /* at top */, atoken);
+ newTask.addAppToken(Integer.MAX_VALUE /* at top */, atoken, taskResizeMode, homeTask);
}
}
@@ -4043,6 +4065,7 @@
// * or the token was marked as hidden and is exiting before we had a chance to play the
// transition animation
// * or this is an opening app and windows are being replaced.
+ boolean visibilityChanged = false;
if (wtoken.hidden == visible || (wtoken.hidden && wtoken.mIsExiting) ||
(visible && wtoken.waitingForReplacement())) {
boolean changed = false;
@@ -4109,6 +4132,7 @@
}
wtoken.hidden = wtoken.hiddenRequested = !visible;
+ visibilityChanged = true;
if (!visible) {
unsetAppFreezingScreenLocked(wtoken, true, true);
} else {
@@ -4146,6 +4170,13 @@
}
}
+ if (visibilityChanged && visible && !delayed) {
+ // The token was made immediately visible, there will be no entrance animation. We need
+ // to inform the client the enter animation was finished.
+ wtoken.mEnteringAnimation = true;
+ mActivityManagerAppTransitionNotifier.onAppTransitionFinishedLocked(wtoken.token);
+ }
+
return delayed;
}
@@ -4207,6 +4238,7 @@
}
wtoken.inPendingTransaction = true;
if (visible) {
+ wtoken.setWindowsExiting(false);
mOpeningApps.add(wtoken);
wtoken.startingMoved = false;
wtoken.mEnteringAnimation = true;
@@ -4231,7 +4263,7 @@
}
}
} else {
- wtoken.markSurfacesExiting();
+ wtoken.setWindowsExiting(true);
mClosingApps.add(wtoken);
wtoken.mEnteringAnimation = false;
}
@@ -8070,8 +8102,29 @@
}
case UPDATE_DOCKED_STACK_DIVIDER: {
synchronized (mWindowMap) {
- getDefaultDisplayContentLocked().getDockedDividerController()
- .reevaluateVisibility(false);
+ final DisplayContent displayContent = getDefaultDisplayContentLocked();
+
+ displayContent.getDockedDividerController().reevaluateVisibility(false);
+
+ final WindowState imeWin = mInputMethodWindow;
+ final TaskStack focusedStack =
+ mCurrentFocus != null ? mCurrentFocus.getStack() : null;
+ if (imeWin != null && focusedStack != null && imeWin.isVisibleNow()
+ && focusedStack.getDockSide() == DOCKED_BOTTOM){
+ final ArrayList<TaskStack> stacks = displayContent.getStacks();
+ for (int i = stacks.size() - 1; i >= 0; --i) {
+ final TaskStack stack = stacks.get(i);
+ if (stack.isVisibleLocked()) {
+ stack.adjustForIME(imeWin);
+ }
+ }
+ } else {
+ final ArrayList<TaskStack> stacks = displayContent.getStacks();
+ for (int i = stacks.size() - 1; i >= 0; --i) {
+ final TaskStack stack = stacks.get(i);
+ stack.adjustForIME(null);
+ }
+ }
}
}
break;
@@ -8085,16 +8138,16 @@
break;
case RESIZE_STACK: {
try {
- mActivityManager.resizeStack(msg.arg1, (Rect) msg.obj, msg.arg2 == 1);
+ mActivityManager.resizeStack(msg.arg1, (Rect) msg.obj, msg.arg2 == 1, false,
+ false);
} catch (RemoteException e) {
// This will not happen since we are in the same process.
}
}
break;
case SHOW_NON_RESIZEABLE_DOCK_TOAST: {
- final Toast toast = Toast.makeText(mContext,
- mContext.getString(R.string.dock_non_resizeble_text),
- Toast.LENGTH_LONG);
+ final Toast toast = Toast.makeText(
+ mContext, (String) msg.obj, Toast.LENGTH_LONG);
final int gravity = toast.getGravity();
final int xOffset = toast.getXOffset() + msg.arg1;
final int yOffset = toast.getYOffset() + msg.arg2;
@@ -10273,12 +10326,43 @@
}
}
- public void setTaskResizeable(int taskId, boolean resizeable) {
+ public void animateResizePinnedStack(final Rect bounds) {
synchronized (mWindowMap) {
- Task task = mTaskIdToTask.get(taskId);
- if (task != null) {
- task.setResizeable(resizeable);
+ final TaskStack stack = mStackIdToStack.get(PINNED_STACK_ID);
+ if (stack == null) {
+ Slog.w(TAG, "animateResizePinnedStack: stackId " + PINNED_STACK_ID + " not found.");
+ return;
}
+ final ArrayList<Task> tasks = stack.getTasks();
+ if (tasks.isEmpty()) {
+ Slog.w(TAG, "animateResizePinnedStack: pinned stack doesn't have any tasks.");
+ return;
+ }
+ final Task task = tasks.get(tasks.size() - 1);
+ task.setDragResizing(true);
+ final Rect originalBounds = new Rect();
+ stack.getBounds(originalBounds);
+ UiThread.getHandler().post(new Runnable() {
+ @Override
+ public void run() {
+ mBoundsAnimationController.animateBounds(stack, originalBounds, bounds);
+ }
+ });
+ }
+ }
+
+ public void setTaskResizeable(int taskId, int resizeMode) {
+ synchronized (mWindowMap) {
+ final Task task = mTaskIdToTask.get(taskId);
+ if (task != null) {
+ task.setResizeable(resizeMode);
+ }
+ }
+ }
+
+ public void setForceResizableTasks(boolean forceResizableTasks) {
+ synchronized (mWindowMap) {
+ mForceResizableTasks = forceResizableTasks;
}
}
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index c541b3f..4a9b356 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -57,6 +57,7 @@
import java.util.ArrayList;
import static android.app.ActivityManager.StackId;
+import static android.app.ActivityManager.StackId.INVALID_STACK_ID;
import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_CONTENT;
import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_FRAME;
@@ -750,15 +751,16 @@
Math.min(mStableFrame.bottom, frame.bottom));
}
- mOverscanInsets.set(Math.max(mOverscanFrame.left - frame.left, 0),
- Math.max(mOverscanFrame.top - frame.top, 0),
- Math.max(frame.right - mOverscanFrame.right, 0),
- Math.max(frame.bottom - mOverscanFrame.bottom, 0));
-
-
+ if (!inFreeformWorkspace()) {
+ // Freeform windows can be positioned outside of the display frame, but that is not a
+ // reason to provide them with overscan insets.
+ mOverscanInsets.set(Math.max(mOverscanFrame.left - frame.left, 0),
+ Math.max(mOverscanFrame.top - frame.top, 0),
+ Math.max(frame.right - mOverscanFrame.right, 0),
+ Math.max(frame.bottom - mOverscanFrame.bottom, 0));
+ }
if (mAttrs.type == TYPE_DOCK_DIVIDER) {
-
// For the docked divider, we calculate the stable insets like a full-screen window
// so it can use it to calculate the snap positions.
mStableInsets.set(Math.max(mStableFrame.left - mDisplayFrame.left, 0),
@@ -1000,11 +1002,12 @@
* @param bounds The rect which gets the bounds.
*/
void getVisibleBounds(Rect bounds) {
- boolean intersectWithStackBounds = mAppToken != null && mAppToken.mCropWindowsToStack;
+ final Task task = getTask();
+ boolean intersectWithStackBounds = task != null && task.cropWindowsToStackBounds();
bounds.setEmpty();
mTmpRect.setEmpty();
if (intersectWithStackBounds) {
- final TaskStack stack = getStack();
+ final TaskStack stack = task.mStack;
if (stack != null) {
stack.getDimBounds(mTmpRect);
} else {
@@ -1444,8 +1447,8 @@
}
for (int i = mAppToken.allAppWindows.size() - 1; i >= 0; i--) {
final WindowState win = mAppToken.allAppWindows.get(i);
- if (DEBUG_ADD_REMOVE) Slog.d(TAG, "Removing replaced window: " + win);
if (win.mWillReplaceWindow && win.mReplacingWindow == this) {
+ if (DEBUG_ADD_REMOVE) Slog.d(TAG, "Removing replaced window: " + win);
win.mWillReplaceWindow = false;
win.mAnimateReplacingWindow = false;
win.mReplacingRemoveRequested = false;
@@ -1930,11 +1933,12 @@
}
void cropRegionToStackBoundsIfNeeded(Region region) {
- if (mAppToken == null || !mAppToken.mCropWindowsToStack) {
+ final Task task = getTask();
+ if (task == null || !task.cropWindowsToStackBounds()) {
return;
}
- final TaskStack stack = getStack();
+ final TaskStack stack = task.mStack;
if (stack == null) {
return;
}
@@ -2051,10 +2055,21 @@
// until the window to small size, otherwise the multithread renderer will shift last
// one or more frame to wrong offset. So here we send fullscreen backdrop if either
// isDragResizing() or isDragResizeChanged() is true.
+ boolean resizing = isDragResizing() || isDragResizeChanged();
+ if (StackId.useWindowFrameForBackdrop(getStackId()) || !resizing) {
+ return frame;
+ }
DisplayInfo displayInfo = getDisplayInfo();
mTmpRect.set(0, 0, displayInfo.logicalWidth, displayInfo.logicalHeight);
- boolean resizing = isDragResizing() || isDragResizeChanged();
- return (inFreeformWorkspace() || !resizing) ? frame : mTmpRect;
+ return mTmpRect;
+ }
+
+ private int getStackId() {
+ final TaskStack stack = getStack();
+ if (stack == null) {
+ return INVALID_STACK_ID;
+ }
+ return stack.mStackId;
}
private void dispatchResized(Rect frame, Rect overscanInsets, Rect contentInsets,
@@ -2175,6 +2190,8 @@
pw.print(prefix); pw.print("mRootToken="); pw.println(mRootToken);
if (mAppToken != null) {
pw.print(prefix); pw.print("mAppToken="); pw.print(mAppToken);
+ pw.print(" isAnimatingWithSavedSurface()=");
+ pw.print(isAnimatingWithSavedSurface());
pw.print(" mAppDied=");pw.println(mAppDied);
}
if (mTargetAppToken != null) {
@@ -2226,7 +2243,8 @@
}
pw.print(prefix); pw.print("mHasSurface="); pw.print(mHasSurface);
pw.print(" mShownPosition="); mShownPosition.printShortString(pw);
- pw.print(" isReadyForDisplay()="); pw.println(isReadyForDisplay());
+ pw.print(" isReadyForDisplay()="); pw.print(isReadyForDisplay());
+ pw.print(" hasSavedSurface()="); pw.println(hasSavedSurface());
if (dumpAll) {
pw.print(prefix); pw.print("mFrame="); mFrame.printShortString(pw);
pw.print(" last="); mLastFrame.printShortString(pw);
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index cffcc5d..e904ad5 100644
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -272,11 +272,14 @@
}
void cancelExitAnimationForNextAnimationLocked() {
+ if (DEBUG_ANIM) Slog.d(TAG,
+ "cancelExitAnimationForNextAnimationLocked: " + mWin);
+
if (mAnimation != null) {
mAnimation.cancel();
mAnimation = null;
mLocalAnimating = false;
- destroySurfaceLocked();
+ mWin.destroyOrSaveSurface();
}
}
@@ -498,10 +501,12 @@
Slog.v(TAG, "Finishing drawing window " + mWin + ": mDrawState="
+ drawStateToString());
}
- if (mWin.mAppToken != null) {
+ if (mWin.mAppToken != null && mWin.mAppToken.mAnimatingWithSavedSurface) {
// App has drawn something to its windows, we're no longer animating with
// the saved surfaces. If the user exits now, we only want to save again
// if allDrawn is true.
+ if (DEBUG_ANIM) Slog.d(TAG,
+ "finishDrawingLocked: mAnimatingWithSavedSurface=false " + mWin);
mWin.mAppToken.mAnimatingWithSavedSurface = false;
}
if (mDrawState == DRAW_PENDING) {
@@ -534,8 +539,7 @@
mDrawState = READY_TO_SHOW;
boolean result = false;
final AppWindowToken atoken = mWin.mAppToken;
- if (atoken == null || atoken.allDrawn || atoken.mAnimatingWithSavedSurface ||
- mWin.mAttrs.type == TYPE_APPLICATION_STARTING) {
+ if (atoken == null || atoken.allDrawn || mWin.mAttrs.type == TYPE_APPLICATION_STARTING) {
result = performShowLocked();
}
if (mDestroyPreservedSurfaceUponRedraw) {
@@ -567,6 +571,12 @@
WindowSurfaceController createSurfaceLocked() {
final WindowState w = mWin;
+ if (w.hasSavedSurface()) {
+ Slog.i(TAG, "***** createSurface: " + this + ": called when we had a saved surface");
+ w.restoreSavedSurface();
+ return mSurfaceController;
+ }
+
if (mSurfaceController == null) {
if (DEBUG_ANIM || DEBUG_ORIENTATION) Slog.i(TAG,
"createSurface " + this + ": mDrawState=DRAW_PENDING");
@@ -1167,9 +1177,8 @@
}
private void adjustCropToStackBounds(WindowState w, Rect clipRect, boolean isFreeformResizing) {
- final AppWindowToken appToken = w.mAppToken;
final Task task = w.getTask();
- if (task == null || !appToken.mCropWindowsToStack) {
+ if (task == null || !task.cropWindowsToStackBounds()) {
return;
}
diff --git a/services/core/java/com/android/server/wm/WindowSurfacePlacer.java b/services/core/java/com/android/server/wm/WindowSurfacePlacer.java
index 761d6e9..d1d4721 100644
--- a/services/core/java/com/android/server/wm/WindowSurfacePlacer.java
+++ b/services/core/java/com/android/server/wm/WindowSurfacePlacer.java
@@ -774,8 +774,9 @@
+ " a=" + winAnimator.mAnimating);
}
}
- if (w != atoken.startingWindow && !w.mAppDied) {
- if (!atoken.mAppAnimator.freezingScreen || !w.mAppFreezing) {
+ if (w != atoken.startingWindow) {
+ if (!w.mAppDied &&
+ (!atoken.mAppAnimator.freezingScreen || !w.mAppFreezing)) {
atoken.numInterestingWindows++;
if (w.isDrawnLw()) {
atoken.numDrawnWindows++;
@@ -1156,8 +1157,6 @@
}
wtoken.inPendingTransaction = false;
- wtoken.restoreSavedSurfaces();
-
if (!mService.setTokenVisibilityLocked(
wtoken, animLp, true, transit, false, voiceInteraction)){
// This token isn't going to be animating. Add it to the list of tokens to
@@ -1277,9 +1276,8 @@
+ wtoken.startingDisplayed + " startingMoved="
+ wtoken.startingMoved);
- if (wtoken.hasSavedSurface() || wtoken.mAnimatingWithSavedSurface) {
- continue;
- }
+ wtoken.restoreSavedSurfaces();
+
if (!wtoken.allDrawn && !wtoken.startingDisplayed && !wtoken.startingMoved) {
return false;
}
diff --git a/services/core/jni/com_android_server_PersistentDataBlockService.cpp b/services/core/jni/com_android_server_PersistentDataBlockService.cpp
index 06de592..f94e5d9 100644
--- a/services/core/jni/com_android_server_PersistentDataBlockService.cpp
+++ b/services/core/jni/com_android_server_PersistentDataBlockService.cpp
@@ -84,7 +84,11 @@
if (fd < 0)
return 0;
- return get_block_device_size(fd);
+ const uint64_t size = get_block_device_size(fd);
+
+ close(fd);
+
+ return size;
}
static int com_android_server_PersistentDataBlockService_wipe(JNIEnv *env, jclass, jstring jpath) {
@@ -94,7 +98,11 @@
if (fd < 0)
return 0;
- return wipe_block_device(fd);
+ const int ret = wipe_block_device(fd);
+
+ close(fd);
+
+ return ret;
}
static const JNINativeMethod sMethods[] = {
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 236ae68e..83aa64e 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -50,6 +50,7 @@
import android.app.admin.SystemUpdatePolicy;
import android.app.backup.IBackupManager;
import android.auditing.SecurityLog;
+import android.auditing.SecurityLog.SecurityEvent;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.ContentResolver;
@@ -63,6 +64,7 @@
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.PackageManagerInternal;
+import android.content.pm.ParceledListSlice;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
import android.content.pm.UserInfo;
@@ -195,7 +197,7 @@
private static final long EXPIRATION_GRACE_PERIOD_MS = 5 * MS_PER_DAY; // 5 days, in ms
- protected static final String ACTION_EXPIRED_PASSWORD_NOTIFICATION
+ private static final String ACTION_EXPIRED_PASSWORD_NOTIFICATION
= "com.android.server.ACTION_EXPIRED_PASSWORD_NOTIFICATION";
private static final int MONITORING_CERT_NOTIFICATION_ID = R.string.ssl_ca_cert_warning;
@@ -210,6 +212,11 @@
private static final String ATTR_APPLICATION_RESTRICTIONS_MANAGER
= "application-restrictions-manager";
+ /**
+ * System property whose value is either "true" or "false", indicating whether
+ */
+ private static final String PROPERTY_DEVICE_OWNER_PRESENT = "ro.device_owner";
+
private static final int STATUS_BAR_DISABLE_MASK =
StatusBarManager.DISABLE_EXPAND |
StatusBarManager.DISABLE_NOTIFICATION_ICONS |
@@ -287,6 +294,8 @@
*/
private boolean mHasFeature;
+ private final SecurityLogMonitor mSecurityLogMonitor;
+
private final AtomicBoolean mRemoteBugreportServiceIsActive = new AtomicBoolean();
private final AtomicBoolean mRemoteBugreportSharingAccepted = new AtomicBoolean();
@@ -438,7 +447,10 @@
|| KeyChain.ACTION_STORAGE_CHANGED.equals(action)) {
new MonitoringCertNotificationTask().execute(intent);
}
- if (Intent.ACTION_USER_REMOVED.equals(action)) {
+ if (Intent.ACTION_USER_ADDED.equals(action)) {
+ disableDeviceLoggingIfNotCompliant();
+ } else if (Intent.ACTION_USER_REMOVED.equals(action)) {
+ disableDeviceLoggingIfNotCompliant();
removeUserData(userHandle);
} else if (Intent.ACTION_USER_STARTED.equals(action)) {
synchronized (DevicePolicyManagerService.this) {
@@ -509,6 +521,7 @@
private static final String TAG_LONG_SUPPORT_MESSAGE = "long-support-message";
private static final String TAG_PARENT_ADMIN = "parent-admin";
private static final String TAG_ORGANIZATION_COLOR = "organization-color";
+ private static final String TAG_ORGANIZATION_NAME = "organization-name";
final DeviceAdminInfo info;
@@ -607,6 +620,9 @@
static final int DEF_ORGANIZATION_COLOR = Color.GRAY;
int organizationColor = DEF_ORGANIZATION_COLOR;
+ // Default title of confirm credentials screen
+ String organizationName = null;
+
ActiveAdmin(DeviceAdminInfo _info, boolean parent) {
info = _info;
isParent = parent;
@@ -830,6 +846,11 @@
out.attribute(null, ATTR_VALUE, Integer.toString(organizationColor));
out.endTag(null, TAG_ORGANIZATION_COLOR);
}
+ if (organizationName != null) {
+ out.startTag(null, TAG_ORGANIZATION_NAME);
+ out.text(organizationName);
+ out.endTag(null, TAG_ORGANIZATION_NAME);
+ }
}
void writePackageListToXml(XmlSerializer out, String outerTag,
@@ -971,6 +992,13 @@
} else if (TAG_ORGANIZATION_COLOR.equals(tag)) {
organizationColor = Integer.parseInt(
parser.getAttributeValue(null, ATTR_VALUE));
+ } else if (TAG_ORGANIZATION_NAME.equals(tag)) {
+ type = parser.next();
+ if (type == XmlPullParser.TEXT) {
+ organizationName = parser.getText();
+ } else {
+ Log.w(LOG_TAG, "Missing text when loading organization name");
+ }
} else {
Slog.w(LOG_TAG, "Unknown admin tag: " + tag);
XmlUtils.skipCurrentTag(parser);
@@ -1179,6 +1207,12 @@
pw.print(prefix); pw.print("keepUninstalledPackages=");
pw.println(keepUninstalledPackages);
}
+ pw.print(prefix); pw.print("organizationColor=");
+ pw.println(organizationColor);
+ if (organizationName != null) {
+ pw.print(prefix); pw.print("organizationName=");
+ pw.println(organizationName);
+ }
pw.print(prefix); pw.println("userRestrictions:");
UserRestrictionsUtils.dumpRestrictions(pw, prefix + " ", userRestrictions);
pw.print(prefix); pw.print("isParent=");
@@ -1448,6 +1482,8 @@
mLocalService = new LocalService();
mLockPatternUtils = injector.newLockPatternUtils();
+ mSecurityLogMonitor = new SecurityLogMonitor(this);
+
mHasFeature = mContext.getPackageManager()
.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN);
if (!mHasFeature) {
@@ -1457,6 +1493,7 @@
IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_BOOT_COMPLETED);
filter.addAction(ACTION_EXPIRED_PASSWORD_NOTIFICATION);
+ filter.addAction(Intent.ACTION_USER_ADDED);
filter.addAction(Intent.ACTION_USER_REMOVED);
filter.addAction(Intent.ACTION_USER_STARTED);
filter.addAction(KeyChain.ACTION_STORAGE_CHANGED);
@@ -1537,6 +1574,7 @@
void loadOwners() {
synchronized (this) {
mOwners.load();
+ setDeviceOwnerSystemPropertyLocked();
findOwnerComponentIfNecessaryLocked();
migrateUserRestrictionsIfNecessaryLocked();
@@ -1546,6 +1584,34 @@
}
}
+ private void setDeviceOwnerSystemPropertyLocked() {
+ // Device owner may still be provisioned, do not set the read-only system property yet.
+ if (mInjector.settingsGlobalGetInt(Settings.Global.DEVICE_PROVISIONED, 0) == 0) {
+ return;
+ }
+ // Still at the first stage of CryptKeeper double bounce, mOwners.hasDeviceOwner is
+ // always false at this point.
+ if ("encrypted".equals(mInjector.systemPropertiesGet("ro.crypto.state"))
+ && "trigger_restart_min_framework".equals(
+ mInjector.systemPropertiesGet("vold.decrypt"))){
+ return;
+ }
+
+ if (!TextUtils.isEmpty(mInjector.systemPropertiesGet(PROPERTY_DEVICE_OWNER_PRESENT))) {
+ Slog.wtf(LOG_TAG, "Trying to set ro.device_owner, but it has already been set?");
+ } else {
+ if (mOwners.hasDeviceOwner()) {
+ mInjector.systemPropertiesSet(PROPERTY_DEVICE_OWNER_PRESENT, "true");
+ disableDeviceLoggingIfNotCompliant();
+ if (SecurityLog.getLoggingEnabledProperty()) {
+ mSecurityLogMonitor.start();
+ }
+ } else {
+ mInjector.systemPropertiesSet(PROPERTY_DEVICE_OWNER_PRESENT, "false");
+ }
+ }
+ }
+
private void findOwnerComponentIfNecessaryLocked() {
if (!mOwners.hasDeviceOwner()) {
return;
@@ -1703,8 +1769,8 @@
* Set an alarm for an upcoming event - expiration warning, expiration, or post-expiration
* reminders. Clears alarm if no expirations are configured.
*/
- private void setExpirationAlarmCheckLocked(Context context, int userHandle) {
- final long expiration = getPasswordExpirationLocked(null, userHandle, /* parent */ false);
+ private void setExpirationAlarmCheckLocked(Context context, int userHandle, boolean parent) {
+ final long expiration = getPasswordExpirationLocked(null, userHandle, parent);
final long now = System.currentTimeMillis();
final long timeToExpire = expiration - now;
final long alarmTime;
@@ -1726,11 +1792,12 @@
long token = mInjector.binderClearCallingIdentity();
try {
+ int affectedUserHandle = parent ? getProfileParentId(userHandle) : userHandle;
AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
PendingIntent pi = PendingIntent.getBroadcastAsUser(context, REQUEST_EXPIRE_PASSWORD,
new Intent(ACTION_EXPIRED_PASSWORD_NOTIFICATION),
PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT,
- UserHandle.of(userHandle));
+ UserHandle.of(affectedUserHandle));
am.cancel(pi);
if (alarmTime != 0) {
am.set(AlarmManager.RTC, alarmTime, pi);
@@ -2489,7 +2556,6 @@
synchronized (this) {
final long now = System.currentTimeMillis();
- // Return the strictest policy across all participating admins.
List<ActiveAdmin> admins = getActiveAdminsForLockscreenPoliciesLocked(
userHandle, /* parent */ false);
final int N = admins.size();
@@ -2503,7 +2569,7 @@
DeviceAdminReceiver.ACTION_PASSWORD_EXPIRING);
}
}
- setExpirationAlarmCheckLocked(mContext, userHandle);
+ setExpirationAlarmCheckLocked(mContext, userHandle, /* parent */ false);
}
}
@@ -2976,8 +3042,7 @@
saveSettingsLocked(userHandle);
// in case this is the first one, set the alarm on the appropriate user.
- int affectedUserHandle = parent ? getProfileParentId(userHandle) : userHandle;
- setExpirationAlarmCheckLocked(mContext, affectedUserHandle);
+ setExpirationAlarmCheckLocked(mContext, userHandle, parent);
}
}
@@ -4324,7 +4389,7 @@
policy.mFailedPasswordAttempts = 0;
saveSettingsLocked(userHandle);
updatePasswordExpirationsLocked(userHandle);
- setExpirationAlarmCheckLocked(mContext, userHandle);
+ setExpirationAlarmCheckLocked(mContext, userHandle, /* parent */ false);
// Send a broadcast to each profile using this password as its primary unlock.
sendAdminCommandForLockscreenPoliciesLocked(
@@ -4876,29 +4941,37 @@
}
}
- private void ensureDeviceOwnerManagingSingleUser(ComponentName who) throws SecurityException {
+ private boolean isDeviceOwnerManagedSingleUserDevice() {
synchronized (this) {
- getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);
+ if (!mOwners.hasDeviceOwner()) {
+ return false;
+ }
}
final long callingIdentity = mInjector.binderClearCallingIdentity();
try {
if (mInjector.userManagerIsSplitSystemUser()) {
// In split system user mode, only allow the case where the device owner is managing
// the only non-system user of the device
- if (mUserManager.getUserCount() > 2
- || mOwners.getDeviceOwnerUserId() == UserHandle.USER_SYSTEM) {
- throw new SecurityException(
- "There should only be one user, managed by Device Owner");
- }
- } else if (mUserManager.getUserCount() > 1) {
- throw new SecurityException(
- "There should only be one user, managed by Device Owner");
+ return (mUserManager.getUserCount() == 2
+ && mOwners.getDeviceOwnerUserId() != UserHandle.USER_SYSTEM);
+ } else {
+ return mUserManager.getUserCount() == 1;
}
} finally {
mInjector.binderRestoreCallingIdentity(callingIdentity);
}
}
+ private void ensureDeviceOwnerManagingSingleUser(ComponentName who) throws SecurityException {
+ synchronized (this) {
+ getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);
+ }
+ if (!isDeviceOwnerManagedSingleUserDevice()) {
+ throw new SecurityException(
+ "There should only be one user, managed by Device Owner");
+ }
+ }
+
@Override
public boolean requestBugreport(ComponentName who) {
if (!mHasFeature) {
@@ -4940,7 +5013,7 @@
}
}
- private synchronized void sendDeviceOwnerCommand(String action, Bundle extras) {
+ synchronized void sendDeviceOwnerCommand(String action, Bundle extras) {
Intent intent = new Intent(action);
intent.setComponent(mOwners.getDeviceOwnerComponent());
if (extras != null) {
@@ -5284,6 +5357,7 @@
mOwners.setDeviceOwner(admin, ownerName, userId);
mOwners.writeDeviceOwner();
updateDeviceOwnerLocked();
+ setDeviceOwnerSystemPropertyLocked();
Intent intent = new Intent(DevicePolicyManager.ACTION_DEVICE_OWNER_CHANGED);
ident = mInjector.binderClearCallingIdentity();
@@ -5415,6 +5489,7 @@
mOwners.clearDeviceOwner();
mOwners.writeDeviceOwner();
updateDeviceOwnerLocked();
+ disableDeviceLoggingIfNotCompliant();
// Reactivate backup service.
long ident = mInjector.binderClearCallingIdentity();
try {
@@ -6772,6 +6847,8 @@
@Override
public void setUserRestriction(ComponentName who, String key, boolean enabledFromThisOwner) {
Preconditions.checkNotNull(who, "ComponentName is null");
+ UserRestrictionsUtils.checkRestriction(key);
+
final int userHandle = mInjector.userHandleGetCallingUserId();
synchronized (this) {
ActiveAdmin activeAdmin =
@@ -7538,6 +7615,8 @@
private final Uri mUserSetupComplete = Settings.Secure.getUriFor(
Settings.Secure.USER_SETUP_COMPLETE);
+ private final Uri mDeviceProvisioned = Settings.Global.getUriFor(
+ Settings.Global.DEVICE_PROVISIONED);
public SetupContentObserver(Handler handler) {
super(handler);
@@ -7545,12 +7624,17 @@
void register(ContentResolver resolver) {
resolver.registerContentObserver(mUserSetupComplete, false, this, UserHandle.USER_ALL);
+ resolver.registerContentObserver(mDeviceProvisioned, false, this, UserHandle.USER_ALL);
}
@Override
public void onChange(boolean selfChange, Uri uri) {
if (mUserSetupComplete.equals(uri)) {
updateUserSetupComplete();
+ } else if (mDeviceProvisioned.equals(uri)) {
+ // Set PROPERTY_DEVICE_OWNER_PRESENT, for the SUW case where setting the property
+ // is delayed until device is marked as provisioned.
+ setDeviceOwnerSystemPropertyLocked();
}
}
}
@@ -8097,11 +8181,12 @@
@Override
public void setOrganizationColor(@NonNull ComponentName who, int color) {
- final int userHandle = mInjector.userHandleGetCallingUserId();
- if (!mHasFeature || !isManagedProfile(userHandle)) {
+ if (!mHasFeature) {
return;
}
Preconditions.checkNotNull(who, "ComponentName is null");
+ final int userHandle = mInjector.userHandleGetCallingUserId();
+ enforceManagedProfile(userHandle, "set organization color");
synchronized (this) {
ActiveAdmin admin = getActiveAdminForCallerLocked(who,
DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
@@ -8112,11 +8197,11 @@
@Override
public int getOrganizationColor(@NonNull ComponentName who) {
- final int userHandle = mInjector.userHandleGetCallingUserId();
- if (!mHasFeature || !isManagedProfile(userHandle)) {
+ if (!mHasFeature) {
return ActiveAdmin.DEF_ORGANIZATION_COLOR;
}
Preconditions.checkNotNull(who, "ComponentName is null");
+ enforceManagedProfile(mInjector.userHandleGetCallingUserId(), "get organization color");
synchronized (this) {
ActiveAdmin admin = getActiveAdminForCallerLocked(who,
DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
@@ -8126,10 +8211,11 @@
@Override
public int getOrganizationColorForUser(int userHandle) {
- if (!mHasFeature || !isManagedProfile(userHandle)) {
+ if (!mHasFeature) {
return ActiveAdmin.DEF_ORGANIZATION_COLOR;
}
- enforceCrossUsersPermission(userHandle);
+ enforceFullCrossUsersPermission(userHandle);
+ enforceManagedProfile(userHandle, "get organization color");
synchronized (this) {
ActiveAdmin profileOwner = getProfileOwnerAdminLocked(userHandle);
return (profileOwner != null)
@@ -8139,6 +8225,53 @@
}
@Override
+ public void setOrganizationName(@NonNull ComponentName who, String text) {
+ if (!mHasFeature) {
+ return;
+ }
+ Preconditions.checkNotNull(who, "ComponentName is null");
+ final int userHandle = mInjector.userHandleGetCallingUserId();
+ enforceManagedProfile(userHandle, "set organization name");
+ synchronized (this) {
+ ActiveAdmin admin = getActiveAdminForCallerLocked(who,
+ DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
+ if (!TextUtils.equals(admin.organizationName, text)) {
+ admin.organizationName = TextUtils.nullIfEmpty(text);
+ saveSettingsLocked(userHandle);
+ }
+ }
+ }
+
+ @Override
+ public String getOrganizationName(@NonNull ComponentName who) {
+ if (!mHasFeature) {
+ return null;
+ }
+ Preconditions.checkNotNull(who, "ComponentName is null");
+ enforceManagedProfile(mInjector.userHandleGetCallingUserId(), "get organization name");
+ synchronized(this) {
+ ActiveAdmin admin = getActiveAdminForCallerLocked(who,
+ DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
+ return admin.organizationName;
+ }
+ }
+
+ @Override
+ public String getOrganizationNameForUser(int userHandle) {
+ if (!mHasFeature) {
+ return null;
+ }
+ enforceFullCrossUsersPermission(userHandle);
+ enforceManagedProfile(userHandle, "get organization name");
+ synchronized (this) {
+ ActiveAdmin profileOwner = getProfileOwnerAdminLocked(userHandle);
+ return (profileOwner != null)
+ ? profileOwner.organizationName
+ : null;
+ }
+ }
+
+ @Override
public void setAffiliationIds(ComponentName admin, List<String> ids) {
final Set<String> affiliationIds = new ArraySet<String>(ids);
final int callingUserId = mInjector.userHandleGetCallingUserId();
@@ -8181,4 +8314,59 @@
}
return false;
}
+
+ private void disableDeviceLoggingIfNotCompliant() {
+ if (!isDeviceOwnerManagedSingleUserDevice()) {
+ SecurityLog.setLoggingEnabledProperty(false);
+ Slog.w(LOG_TAG, "Device logging turned off as it's no longer a single user device.");
+ }
+ }
+
+ @Override
+ public void setDeviceLoggingEnabled(ComponentName admin, boolean enabled) {
+ Preconditions.checkNotNull(admin);
+ ensureDeviceOwnerManagingSingleUser(admin);
+
+ synchronized (this) {
+ SecurityLog.setLoggingEnabledProperty(enabled);
+ if (enabled) {
+ mSecurityLogMonitor.start();
+ } else {
+ mSecurityLogMonitor.stop();
+ }
+ }
+ }
+
+ @Override
+ public boolean getDeviceLoggingEnabled(ComponentName admin) {
+ Preconditions.checkNotNull(admin);
+ synchronized (this) {
+ getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);
+ return SecurityLog.getLoggingEnabledProperty();
+ }
+ }
+
+ @Override
+ public ParceledListSlice<SecurityEvent> retrievePreviousDeviceLogs(ComponentName admin) {
+ Preconditions.checkNotNull(admin);
+ ensureDeviceOwnerManagingSingleUser(admin);
+
+ ArrayList<SecurityEvent> output = new ArrayList<SecurityEvent>();
+ try {
+ SecurityLog.readPreviousEvents(output);
+ return new ParceledListSlice<SecurityEvent>(output);
+ } catch (IOException e) {
+ Slog.w(LOG_TAG, "Fail to read previous events" , e);
+ return new ParceledListSlice<SecurityEvent>(Collections.<SecurityEvent>emptyList());
+ }
+ }
+
+ @Override
+ public ParceledListSlice<SecurityEvent> retrieveDeviceLogs(ComponentName admin) {
+ Preconditions.checkNotNull(admin);
+ ensureDeviceOwnerManagingSingleUser(admin);
+
+ List<SecurityEvent> logs = mSecurityLogMonitor.retrieveLogs();
+ return logs != null ? new ParceledListSlice<SecurityEvent>(logs) : null;
+ }
}
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/SecurityLogMonitor.java b/services/devicepolicy/java/com/android/server/devicepolicy/SecurityLogMonitor.java
new file mode 100644
index 0000000..f2d6180
--- /dev/null
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/SecurityLogMonitor.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.devicepolicy;
+
+import android.app.admin.DeviceAdminReceiver;
+import android.auditing.SecurityLog;
+import android.auditing.SecurityLog.SecurityEvent;
+import android.util.Log;
+import android.util.Slog;
+
+import com.android.internal.annotations.GuardedBy;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import android.os.Process;
+
+/**
+ * A class managing access to the security logs. It maintains an internal buffer of pending
+ * logs to be retrieved by the device owner. The logs are retrieved from the logd daemon via
+ * JNI binding, and kept until device owner has retrieved to prevent loss of logs. Access to
+ * the logs from the device owner is rate-limited, and device owner is notified when the logs
+ * are ready to be retrieved. This happens every two hours, or when our internal buffer is
+ * larger than a certain threshold.
+ */
+class SecurityLogMonitor implements Runnable {
+ private final DevicePolicyManagerService mService;
+
+ SecurityLogMonitor(DevicePolicyManagerService service) {
+ mService = service;
+ }
+
+ private static final boolean DEBUG = false;
+ private static final String TAG = "SecurityLogMonitor";
+ /**
+ * Each log entry can hold up to 4K bytes (but as of {@link android.os.Build.VERSION_CODES#N}
+ * it should be less than 100 bytes), setting 1024 entries as the threshold to notify Device
+ * Owner.
+ */
+ private static final int BUFFER_ENTRIES_NOTIFICATION_LEVEL = 1024;
+ /**
+ * The maximum number of entries we should store before dropping earlier logs, to limit the
+ * memory usage.
+ */
+ private static final int BUFFER_ENTRIES_MAXIMUM_LEVEL = BUFFER_ENTRIES_NOTIFICATION_LEVEL * 10;
+ /**
+ * How often should Device Owner be notified under normal circumstances.
+ */
+ private static final long RATE_LIMIT_INTERVAL_MILLISECONDS = TimeUnit.HOURS.toMillis(2);
+ /**
+ * Internally how often should the monitor poll the security logs from logd.
+ */
+ private static final long POLLING_INTERVAL_MILLISECONDS = TimeUnit.MINUTES.toMillis(1);
+
+ @GuardedBy("this")
+ private Thread mMonitorThread = null;
+ @GuardedBy("this")
+ private ArrayList<SecurityEvent> mPendingLogs = new ArrayList<SecurityEvent>();
+ @GuardedBy("this")
+ private boolean mAllowedToRetrieve = false;
+ // When DO will be allowed to retrieves the log, in milliseconds.
+ @GuardedBy("this")
+ private long mNextAllowedRetrivalTimeMillis = -1;
+
+ synchronized void start() {
+ if (mMonitorThread == null) {
+ mPendingLogs = new ArrayList<SecurityEvent>();
+ mAllowedToRetrieve = false;
+ mNextAllowedRetrivalTimeMillis = -1;
+
+ mMonitorThread = new Thread(this);
+ mMonitorThread.start();
+ }
+ }
+
+ synchronized void stop() {
+ if (mMonitorThread != null) {
+ mMonitorThread.interrupt();
+ try {
+ mMonitorThread.join(TimeUnit.SECONDS.toMillis(5));
+ } catch (InterruptedException e) {
+ Log.e(TAG, "Interrupted while waiting for thread to stop", e);
+ }
+ mMonitorThread = null;
+ }
+ }
+
+ /**
+ * Returns the new batch of logs since the last call to this method. Returns null if
+ * rate limit is exceeded.
+ */
+ synchronized List<SecurityEvent> retrieveLogs() {
+ if (mAllowedToRetrieve) {
+ mAllowedToRetrieve = false;
+ mNextAllowedRetrivalTimeMillis = System.currentTimeMillis()
+ + RATE_LIMIT_INTERVAL_MILLISECONDS;
+ List<SecurityEvent> result = mPendingLogs;
+ mPendingLogs = new ArrayList<SecurityEvent>();
+ return result;
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public void run() {
+ Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
+
+ ArrayList<SecurityEvent> logs = new ArrayList<SecurityEvent>();
+ // The timestamp of the latest log entry that has been read, in nanoseconds
+ long lastLogTimestampNanos = -1;
+ while (!Thread.currentThread().isInterrupted()) {
+ try {
+ Thread.sleep(POLLING_INTERVAL_MILLISECONDS);
+
+ if (lastLogTimestampNanos < 0) {
+ // Non-blocking read that returns all logs immediately.
+ if (DEBUG) Slog.d(TAG, "SecurityLog.readEvents");
+ SecurityLog.readEvents(logs);
+ } else {
+ if (DEBUG) Slog.d(TAG,
+ "SecurityLog.readEventsSince: " + lastLogTimestampNanos);
+ // Non-blocking read that returns all logs >= the timestamp immediately.
+ SecurityLog.readEventsSince(lastLogTimestampNanos + 1, logs);
+ }
+ if (!logs.isEmpty()) {
+ if (DEBUG) Slog.d(TAG, "processing new logs");
+ synchronized (this) {
+ mPendingLogs.addAll(logs);
+ if (mPendingLogs.size() > BUFFER_ENTRIES_MAXIMUM_LEVEL) {
+ // Truncate buffer down to half of BUFFER_ENTRIES_MAXIMUM_LEVEL
+ mPendingLogs = new ArrayList<SecurityEvent>(mPendingLogs.subList(
+ mPendingLogs.size() - (BUFFER_ENTRIES_MAXIMUM_LEVEL / 2),
+ mPendingLogs.size()));
+ }
+ }
+ lastLogTimestampNanos = logs.get(logs.size() - 1).getTimeNanos();
+ logs.clear();
+ }
+ notifyDeviceOwnerIfNeeded();
+ } catch (IOException e) {
+ Log.e(TAG, "Failed to read security log", e);
+ } catch (InterruptedException e) {
+ Log.i(TAG, "Thread interrupted, exiting.", e);
+ // We are asked to stop.
+ break;
+ }
+ }
+ if (DEBUG) Slog.d(TAG, "MonitorThread exit.");
+ synchronized (this) {
+ // Reset state and clear buffer
+ mPendingLogs = new ArrayList<SecurityEvent>();
+ mAllowedToRetrieve = false;
+ mNextAllowedRetrivalTimeMillis = -1;
+ }
+ }
+
+ private void notifyDeviceOwnerIfNeeded() {
+ boolean shouldNotifyDO = false;
+ boolean allowToRetrieveNow = false;
+ synchronized (this) {
+ int logSize = mPendingLogs.size();
+ if (logSize >= BUFFER_ENTRIES_NOTIFICATION_LEVEL) {
+ // Allow DO to retrieve logs if too many pending logs
+ allowToRetrieveNow = true;
+ } else if (logSize > 0) {
+ if (mNextAllowedRetrivalTimeMillis == -1 ||
+ System.currentTimeMillis() >= mNextAllowedRetrivalTimeMillis) {
+ // Rate limit reset
+ allowToRetrieveNow = true;
+ }
+ }
+ shouldNotifyDO = (!mAllowedToRetrieve) && allowToRetrieveNow;
+ mAllowedToRetrieve = allowToRetrieveNow;
+ }
+ if (shouldNotifyDO) {
+ if (DEBUG) Slog.d(TAG, "notify DO");
+ mService.sendDeviceOwnerCommand(DeviceAdminReceiver.ACTION_SECURITY_LOGS_AVAILABLE,
+ null);
+ }
+ }
+}
\ No newline at end of file
diff --git a/services/net/java/android/net/ip/IpManager.java b/services/net/java/android/net/ip/IpManager.java
new file mode 100644
index 0000000..87ac846
--- /dev/null
+++ b/services/net/java/android/net/ip/IpManager.java
@@ -0,0 +1,461 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.ip;
+
+import android.content.Context;
+import android.net.DhcpResults;
+import android.net.LinkProperties;
+import android.net.LinkProperties.ProvisioningChange;
+import android.net.RouteInfo;
+import android.net.StaticIpConfiguration;
+import android.os.INetworkManagementService;
+import android.os.Message;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.util.Log;
+
+import com.android.internal.annotations.GuardedBy;
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.util.State;
+import com.android.internal.util.StateMachine;
+import com.android.server.net.NetlinkTracker;
+
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+
+
+/**
+ * IpManager
+ *
+ * This class provides the interface to IP-layer provisioning and maintenance
+ * functionality that can be used by transport layers like Wi-Fi, Ethernet,
+ * et cetera.
+ *
+ * [ Lifetime ]
+ * IpManager is designed to be instantiated as soon as the interface name is
+ * known and can be as long-lived as the class containing it (i.e. declaring
+ * it "private final" is okay).
+ *
+ * @hide
+ */
+public class IpManager extends StateMachine {
+ private static final String TAG = IpManager.class.getSimpleName();
+ private static final boolean DBG = true;
+ private static final boolean VDBG = false;
+
+ /**
+ * Callbacks for both configuration of IpManager and for handling
+ * events as desired.
+ */
+ public static class Callback {
+ /**
+ * Configuration callbacks.
+ *
+ * Override methods as desired in order to control which features
+ * IpManager will use at run time.
+ */
+
+ // An IpReachabilityMonitor will always be started, if only for logging.
+ // This method is checked before probing neighbors and before calling
+ // onProvisioningLost() (see below).
+ public boolean usingIpReachabilityMonitor() {
+ return false;
+ }
+
+ /**
+ * Event callbacks.
+ *
+ * Override methods as desired in order to handle event callbacks
+ * as IpManager invokes them.
+ */
+
+ // TODO: Kill with fire once DHCP and static configuration are moved
+ // out of WifiStateMachine.
+ public void onIPv4ProvisioningSuccess(DhcpResults dhcpResults, int reason) {}
+ public void onIPv4ProvisioningFailure(int reason) {}
+
+ public void onProvisioningSuccess(LinkProperties newLp) {}
+ public void onProvisioningFailure(LinkProperties newLp) {}
+
+ // Invoked on LinkProperties changes.
+ public void onLinkPropertiesChange(LinkProperties newLp) {}
+
+ // Called when the internal IpReachabilityMonitor (if enabled) has
+ // detected the loss of a critical number of required neighbors.
+ public void onReachabilityLost(String logMsg) {}
+ }
+
+ private static final int CMD_STOP = 1;
+ private static final int CMD_START = 2;
+ private static final int CMD_CONFIRM = 3;
+ private static final int CMD_UPDATE_DHCPV4_RESULTS = 4;
+ // Sent by NetlinkTracker to communicate netlink events.
+ private static final int EVENT_NETLINK_LINKPROPERTIES_CHANGED = 5;
+
+ private static final int MAX_LOG_RECORDS = 1000;
+
+ private final Object mLock = new Object();
+ private final State mStoppedState = new StoppedState();
+ private final State mStartedState = new StartedState();
+
+ private final Context mContext;
+ private final String mInterfaceName;
+ @VisibleForTesting
+ protected final Callback mCallback;
+ private final INetworkManagementService mNwService;
+ private final NetlinkTracker mNetlinkTracker;
+
+ private int mInterfaceIndex;
+
+ /**
+ * Non-final member variables accessed only from within our StateMachine.
+ */
+ private IpReachabilityMonitor mIpReachabilityMonitor;
+ private DhcpResults mDhcpResults;
+ private StaticIpConfiguration mStaticIpConfig;
+
+ /**
+ * Member variables accessed both from within the StateMachine thread
+ * and via accessors from other threads.
+ */
+ @GuardedBy("mLock")
+ private LinkProperties mLinkProperties;
+
+ public IpManager(Context context, String ifName, Callback callback)
+ throws IllegalArgumentException {
+ super(TAG + "." + ifName);
+
+ mContext = context;
+ mInterfaceName = ifName;
+
+ mCallback = callback;
+
+ mNwService = INetworkManagementService.Stub.asInterface(
+ ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE));
+
+ mNetlinkTracker = new NetlinkTracker(
+ mInterfaceName,
+ new NetlinkTracker.Callback() {
+ @Override
+ public void update() {
+ sendMessage(EVENT_NETLINK_LINKPROPERTIES_CHANGED);
+ }
+ });
+ try {
+ mNwService.registerObserver(mNetlinkTracker);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Couldn't register NetlinkTracker: " + e.toString());
+ }
+
+ resetLinkProperties();
+
+ // Super simple StateMachine.
+ addState(mStoppedState);
+ addState(mStartedState);
+ setInitialState(mStoppedState);
+ setLogRecSize(MAX_LOG_RECORDS);
+ super.start();
+ }
+
+ /**
+ * A special constructor for use in testing that bypasses some of the more
+ * complicated setup bits.
+ *
+ * TODO: Figure out how to delete this yet preserve testability.
+ */
+ @VisibleForTesting
+ protected IpManager(String ifName, Callback callback) {
+ super(TAG + ".test-" + ifName);
+ mInterfaceName = ifName;
+ mCallback = callback;
+
+ mContext = null;
+ mNwService = null;
+ mNetlinkTracker = null;
+ }
+
+ public void startProvisioning(StaticIpConfiguration staticIpConfig) {
+ getInterfaceIndex();
+
+ sendMessage(CMD_START, staticIpConfig);
+ }
+
+ public void startProvisioning() {
+ getInterfaceIndex();
+
+ sendMessage(CMD_START);
+ }
+
+ public void stop() {
+ sendMessage(CMD_STOP);
+ }
+
+ public void confirmConfiguration() {
+ sendMessage(CMD_CONFIRM);
+ }
+
+ public LinkProperties getLinkProperties() {
+ synchronized (mLock) {
+ return new LinkProperties(mLinkProperties);
+ }
+ }
+
+ // TODO: Kill with fire once DHCPv4/static config is moved into IpManager.
+ public void updateWithDhcpResults(DhcpResults dhcpResults, int reason) {
+ sendMessage(CMD_UPDATE_DHCPV4_RESULTS, reason, 0, dhcpResults);
+ }
+
+
+ /**
+ * Internals.
+ */
+
+ private void getInterfaceIndex() {
+ try {
+ mInterfaceIndex = NetworkInterface.getByName(mInterfaceName).getIndex();
+ } catch (SocketException | NullPointerException e) {
+ // TODO: throw new IllegalStateException.
+ Log.e(TAG, "ALERT: Failed to get interface index: ", e);
+ }
+ }
+
+ // This needs to be called with care to ensure that our LinkProperties
+ // are in sync with the actual LinkProperties of the interface. For example,
+ // we should only call this if we know for sure that there are no IP addresses
+ // assigned to the interface, etc.
+ private void resetLinkProperties() {
+ mNetlinkTracker.clearLinkProperties();
+ mDhcpResults = null;
+ mStaticIpConfig = null;
+
+ synchronized (mLock) {
+ mLinkProperties = new LinkProperties();
+ mLinkProperties.setInterfaceName(mInterfaceName);
+ }
+ }
+
+ private ProvisioningChange setLinkProperties(LinkProperties newLp) {
+ if (mIpReachabilityMonitor != null) {
+ mIpReachabilityMonitor.updateLinkProperties(newLp);
+ }
+
+ // TODO: Figure out whether and how to incorporate static configuration
+ // into the notion of provisioning.
+ ProvisioningChange delta;
+ synchronized (mLock) {
+ delta = LinkProperties.compareProvisioning(mLinkProperties, newLp);
+ mLinkProperties = new LinkProperties(newLp);
+ }
+
+ if (DBG) {
+ switch (delta) {
+ case GAINED_PROVISIONING:
+ case LOST_PROVISIONING:
+ Log.d(TAG, "provisioning: " + delta);
+ break;
+ }
+ }
+
+ return delta;
+ }
+
+ private LinkProperties assembleLinkProperties() {
+ // [1] Create a new LinkProperties object to populate.
+ LinkProperties newLp = new LinkProperties();
+ newLp.setInterfaceName(mInterfaceName);
+
+ // [2] Pull in data from netlink:
+ // - IPv4 addresses
+ // - IPv6 addresses
+ // - IPv6 routes
+ // - IPv6 DNS servers
+ LinkProperties netlinkLinkProperties = mNetlinkTracker.getLinkProperties();
+ newLp.setLinkAddresses(netlinkLinkProperties.getLinkAddresses());
+ for (RouteInfo route : netlinkLinkProperties.getRoutes()) {
+ newLp.addRoute(route);
+ }
+ for (InetAddress dns : netlinkLinkProperties.getDnsServers()) {
+ // Only add likely reachable DNS servers.
+ // TODO: investigate deleting this.
+ if (newLp.isReachable(dns)) {
+ newLp.addDnsServer(dns);
+ }
+ }
+
+ // [3] Add in data from DHCPv4, if available.
+ //
+ // mDhcpResults is never shared with any other owner so we don't have
+ // to worry about concurrent modification.
+ if (mDhcpResults != null) {
+ for (RouteInfo route : mDhcpResults.getRoutes(mInterfaceName)) {
+ newLp.addRoute(route);
+ }
+ for (InetAddress dns : mDhcpResults.dnsServers) {
+ // Only add likely reachable DNS servers.
+ // TODO: investigate deleting this.
+ if (newLp.isReachable(dns)) {
+ newLp.addDnsServer(dns);
+ }
+ }
+ newLp.setDomains(mDhcpResults.domains);
+ }
+
+ if (VDBG) {
+ Log.d(TAG, "newLp{" + newLp + "}");
+ }
+
+ return newLp;
+ }
+
+ class StoppedState extends State {
+ @Override
+ public void enter() {
+ try {
+ mNwService.disableIpv6(mInterfaceName);
+ mNwService.clearInterfaceAddresses(mInterfaceName);
+ } catch (Exception e) {
+ Log.e(TAG, "Failed to clear addresses or disable IPv6" + e);
+ }
+
+ resetLinkProperties();
+ }
+
+ @Override
+ public boolean processMessage(Message msg) {
+ switch (msg.what) {
+ case CMD_STOP:
+ break;
+
+ case CMD_START:
+ mStaticIpConfig = (StaticIpConfiguration) msg.obj;
+ transitionTo(mStartedState);
+ break;
+
+ case EVENT_NETLINK_LINKPROPERTIES_CHANGED:
+ setLinkProperties(assembleLinkProperties());
+ break;
+
+ default:
+ return NOT_HANDLED;
+ }
+ return HANDLED;
+ }
+ }
+
+ class StartedState extends State {
+ @Override
+ public void enter() {
+ // Set privacy extensions.
+ try {
+ mNwService.setInterfaceIpv6PrivacyExtensions(mInterfaceName, true);
+ mNwService.enableIpv6(mInterfaceName);
+ } catch (RemoteException re) {
+ Log.e(TAG, "Unable to change interface settings: " + re);
+ } catch (IllegalStateException ie) {
+ Log.e(TAG, "Unable to change interface settings: " + ie);
+ }
+
+ mIpReachabilityMonitor = new IpReachabilityMonitor(
+ mContext,
+ mInterfaceName,
+ new IpReachabilityMonitor.Callback() {
+ @Override
+ public void notifyLost(InetAddress ip, String logMsg) {
+ if (mCallback.usingIpReachabilityMonitor()) {
+ mCallback.onReachabilityLost(logMsg);
+ }
+ }
+ });
+
+ // TODO: Check mStaticIpConfig and handle accordingly.
+ }
+
+ @Override
+ public void exit() {
+ mIpReachabilityMonitor.stop();
+ mIpReachabilityMonitor = null;
+
+ resetLinkProperties();
+ }
+
+ @Override
+ public boolean processMessage(Message msg) {
+ switch (msg.what) {
+ case CMD_STOP:
+ transitionTo(mStoppedState);
+ break;
+
+ case CMD_START:
+ // TODO: Defer this message to be delivered after a state transition
+ // to StoppedState. That way, receiving CMD_START in StartedState
+ // effects a restart.
+ Log.e(TAG, "ALERT: START received in StartedState.");
+ break;
+
+ case CMD_CONFIRM:
+ if (mCallback.usingIpReachabilityMonitor()) {
+ mIpReachabilityMonitor.probeAll();
+ }
+ break;
+
+ case CMD_UPDATE_DHCPV4_RESULTS:
+ final DhcpResults dhcpResults = (DhcpResults) msg.obj;
+ final int reason = msg.arg1;
+ if (dhcpResults != null) {
+ mDhcpResults = new DhcpResults(dhcpResults);
+ setLinkProperties(assembleLinkProperties());
+ mCallback.onIPv4ProvisioningSuccess(dhcpResults, reason);
+ } else {
+ mDhcpResults = null;
+ setLinkProperties(assembleLinkProperties());
+ mCallback.onIPv4ProvisioningFailure(reason);
+ }
+ break;
+
+ case EVENT_NETLINK_LINKPROPERTIES_CHANGED:
+ final LinkProperties newLp = assembleLinkProperties();
+ final ProvisioningChange delta = setLinkProperties(newLp);
+
+ // NOTE: The only receiver of these callbacks currently
+ // treats all three of them identically, namely it calls
+ // IpManager#getLinkProperties() and makes its own determination.
+ switch (delta) {
+ case GAINED_PROVISIONING:
+ mCallback.onProvisioningSuccess(newLp);
+ break;
+
+ case LOST_PROVISIONING:
+ mCallback.onProvisioningFailure(newLp);
+ break;
+
+ default:
+ // TODO: Only notify on STILL_PROVISIONED?
+ mCallback.onLinkPropertiesChange(newLp);
+ break;
+ }
+
+ break;
+
+ default:
+ return NOT_HANDLED;
+ }
+ return HANDLED;
+ }
+
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java
index 27d5207..5874429 100644
--- a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java
@@ -52,10 +52,12 @@
import android.os.ConditionVariable;
import android.os.Handler;
import android.os.HandlerThread;
+import android.os.IBinder;
import android.os.INetworkManagementService;
import android.os.Looper;
import android.os.Message;
import android.os.MessageQueue;
+import android.os.Messenger;
import android.os.MessageQueue.IdleHandler;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.LargeTest;
@@ -1298,6 +1300,36 @@
validatedCallback.expectCallback(CallbackState.LOST);
}
+ @SmallTest
+ public void testInvalidNetworkSpecifier() {
+ boolean execptionCalled = true;
+
+ try {
+ NetworkRequest.Builder builder = new NetworkRequest.Builder();
+ builder.setNetworkSpecifier(MATCH_ALL_REQUESTS_NETWORK_SPECIFIER);
+ execptionCalled = false;
+ } catch (IllegalArgumentException e) {
+ // do nothing - should get here
+ }
+
+ assertTrue("NetworkReqeuest builder with MATCH_ALL_REQUESTS_NETWORK_SPECIFIER",
+ execptionCalled);
+
+ try {
+ NetworkCapabilities networkCapabilities = new NetworkCapabilities();
+ networkCapabilities.addTransportType(TRANSPORT_WIFI)
+ .setNetworkSpecifier(NetworkCapabilities.MATCH_ALL_REQUESTS_NETWORK_SPECIFIER);
+ mService.requestNetwork(networkCapabilities, null, 0, null,
+ ConnectivityManager.TYPE_WIFI);
+ execptionCalled = false;
+ } catch (IllegalArgumentException e) {
+ // do nothing - should get here
+ }
+
+ assertTrue("ConnectivityService requestNetwork with MATCH_ALL_REQUESTS_NETWORK_SPECIFIER",
+ execptionCalled);
+ }
+
private static class TestKeepaliveCallback extends PacketKeepaliveCallback {
public static enum CallbackType { ON_STARTED, ON_STOPPED, ON_ERROR };
diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
index b4bca3e..6c2fcd5 100644
--- a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
@@ -26,7 +26,10 @@
import android.os.UserManager;
import android.test.AndroidTestCase;
+import com.android.internal.util.ArrayUtils;
+
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/** Test {@link UserManager} functionality. */
@@ -196,6 +199,17 @@
assertEquals(user2.id, mUserManager.getUserHandle(serialNumber2));
}
+ public void testGetSerialNumbersOfUsers() {
+ UserInfo user1 = createUser("User 1", 0);
+ UserInfo user2 = createUser("User 2", 0);
+ long[] serialNumbersOfUsers = mUserManager.getSerialNumbersOfUsers(false);
+ String errMsg = "Array " + Arrays.toString(serialNumbersOfUsers) + " should contain ";
+ assertTrue(errMsg + user1.serialNumber,
+ ArrayUtils.contains(serialNumbersOfUsers, user1.serialNumber));
+ assertTrue(errMsg + user2.serialNumber,
+ ArrayUtils.contains(serialNumbersOfUsers, user2.serialNumber));
+ }
+
public void testMaxUsers() {
int N = UserManager.getMaxSupportedUsers();
int count = mUserManager.getUsers().size();
diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java
index 81031da..77740387 100644
--- a/services/usage/java/com/android/server/usage/UsageStatsService.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsService.java
@@ -123,6 +123,7 @@
static final int MSG_PAROLE_END_TIMEOUT = 7;
static final int MSG_REPORT_CONTENT_PROVIDER_USAGE = 8;
static final int MSG_PAROLE_STATE_CHANGED = 9;
+ static final int MSG_ONE_TIME_CHECK_IDLE_STATES = 10;
private final Object mLock = new Object();
Handler mHandler;
@@ -144,8 +145,10 @@
private boolean mScreenOn;
private long mLastAppIdleParoledTime;
+ private volatile boolean mPendingOneTimeCheckIdleStates;
+
long mScreenOnTime;
- long mScreenOnSystemTimeSnapshot;
+ long mLastScreenOnEventRealtime;
@GuardedBy("mLock")
private AppIdleHistory mAppIdleHistory = new AppIdleHistory();
@@ -188,6 +191,8 @@
synchronized (mLock) {
cleanUpRemovedUsersLocked();
+ mLastScreenOnEventRealtime = SystemClock.elapsedRealtime();
+ mScreenOnTime = readScreenOnTimeLocked();
}
mRealTimeSnapshot = SystemClock.elapsedRealtime();
@@ -214,14 +219,14 @@
Context.DISPLAY_SERVICE);
mPowerManager = getContext().getSystemService(PowerManager.class);
- mScreenOnSystemTimeSnapshot = System.currentTimeMillis();
- synchronized (mLock) {
- mScreenOnTime = readScreenOnTimeLocked();
- }
mDisplayManager.registerDisplayListener(mDisplayListener, mHandler);
synchronized (mLock) {
updateDisplayLocked();
}
+
+ if (mPendingOneTimeCheckIdleStates) {
+ postOneTimeCheckIdleStates();
+ }
} else if (phase == PHASE_BOOT_COMPLETED) {
setAppIdleParoled(getContext().getSystemService(BatteryManager.class).isCharging());
}
@@ -281,6 +286,11 @@
}
@Override
+ public void onStatsReloaded() {
+ postOneTimeCheckIdleStates();
+ }
+
+ @Override
public long getAppIdleRollingWindowDurationMillis() {
return mAppIdleWallclockThresholdMillis * 2;
}
@@ -359,6 +369,20 @@
mHandler.sendMessage(mHandler.obtainMessage(MSG_CHECK_IDLE_STATES, userId, 0));
}
+ /**
+ * We send a different message to check idle states once, otherwise we would end up
+ * scheduling a series of repeating checkIdleStates each time we fired off one.
+ */
+ void postOneTimeCheckIdleStates() {
+ if (mDeviceIdleController == null) {
+ // Not booted yet; wait for it!
+ mPendingOneTimeCheckIdleStates = true;
+ } else {
+ mHandler.sendEmptyMessage(MSG_ONE_TIME_CHECK_IDLE_STATES);
+ mPendingOneTimeCheckIdleStates = false;
+ }
+ }
+
/** Check all running users' or specified user's apps to see if they enter an idle state. */
void checkIdleStates(int checkUserId) {
if (!mAppIdleEnabled) {
@@ -385,7 +409,7 @@
userId);
synchronized (mLock) {
final long timeNow = checkAndGetTimeLocked();
- final long screenOnTime = getScreenOnTimeLocked(timeNow);
+ final long screenOnTime = getScreenOnTimeLocked();
UserUsageStatsService service = getUserDataAndInitializeIfNeededLocked(userId,
timeNow);
final int packageCount = packages.size();
@@ -401,8 +425,6 @@
}
}
}
- mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_CHECK_IDLE_STATES, checkUserId, 0),
- mCheckIdleIntervalMillis);
}
/** Check if it's been a while since last parole and let idle apps do some work */
@@ -443,21 +465,21 @@
if (screenOn == mScreenOn) return;
mScreenOn = screenOn;
- long now = System.currentTimeMillis();
+ long now = SystemClock.elapsedRealtime();
if (mScreenOn) {
- mScreenOnSystemTimeSnapshot = now;
+ mLastScreenOnEventRealtime = now;
} else {
- mScreenOnTime += now - mScreenOnSystemTimeSnapshot;
+ mScreenOnTime += now - mLastScreenOnEventRealtime;
writeScreenOnTimeLocked(mScreenOnTime);
}
}
- private long getScreenOnTimeLocked(long now) {
+ long getScreenOnTimeLocked() {
+ long screenOnTime = mScreenOnTime;
if (mScreenOn) {
- return now - mScreenOnSystemTimeSnapshot + mScreenOnTime;
- } else {
- return mScreenOnTime;
+ screenOnTime += SystemClock.elapsedRealtime() - mLastScreenOnEventRealtime;
}
+ return screenOnTime;
}
private File getScreenOnTimeFile() {
@@ -527,7 +549,7 @@
if (service == null) {
service = new UserUsageStatsService(getContext(), userId,
new File(mUsageStatsDir, Integer.toString(userId)), this);
- service.init(currentTimeMillis, getScreenOnTimeLocked(currentTimeMillis));
+ service.init(currentTimeMillis, getScreenOnTimeLocked());
mUserState.put(userId, service);
}
return service;
@@ -540,25 +562,18 @@
final long actualSystemTime = System.currentTimeMillis();
final long actualRealtime = SystemClock.elapsedRealtime();
final long expectedSystemTime = (actualRealtime - mRealTimeSnapshot) + mSystemTimeSnapshot;
- boolean resetBeginIdleTime = false;
- if (Math.abs(actualSystemTime - expectedSystemTime) > TIME_CHANGE_THRESHOLD_MILLIS) {
+ final long diffSystemTime = actualSystemTime - expectedSystemTime;
+ if (Math.abs(diffSystemTime) > TIME_CHANGE_THRESHOLD_MILLIS) {
// The time has changed.
-
- // Check if it's severe enough a change to reset screenOnTime
- if (Math.abs(actualSystemTime - expectedSystemTime) > mAppIdleDurationMillis) {
- mScreenOnSystemTimeSnapshot = actualSystemTime;
- mScreenOnTime = 0;
- resetBeginIdleTime = true;
- }
+ Slog.i(TAG, "Time changed in UsageStats by " + (diffSystemTime / 1000) + " seconds");
final int userCount = mUserState.size();
for (int i = 0; i < userCount; i++) {
final UserUsageStatsService service = mUserState.valueAt(i);
- service.onTimeChanged(expectedSystemTime, actualSystemTime, mScreenOnTime,
- resetBeginIdleTime);
+ service.onTimeChanged(expectedSystemTime, actualSystemTime, getScreenOnTimeLocked(),
+ false);
}
mRealTimeSnapshot = actualRealtime;
mSystemTimeSnapshot = actualSystemTime;
- postCheckIdleStates(UserHandle.USER_ALL);
}
return actualSystemTime;
}
@@ -587,7 +602,7 @@
void reportEvent(UsageEvents.Event event, int userId) {
synchronized (mLock) {
final long timeNow = checkAndGetTimeLocked();
- final long screenOnTime = getScreenOnTimeLocked(timeNow);
+ final long screenOnTime = getScreenOnTimeLocked();
convertToSystemTimeLocked(event);
final UserUsageStatsService service =
@@ -603,7 +618,6 @@
|| event.mEventType == Event.SYSTEM_INTERACTION
|| event.mEventType == Event.USER_INTERACTION)) {
if (previouslyIdle) {
- //Slog.d(TAG, "Informing listeners of out-of-idle " + event.mPackage);
mHandler.sendMessage(mHandler.obtainMessage(MSG_INFORM_LISTENERS, userId,
/* idle = */ 0, event.mPackage));
notifyBatteryStats(event.mPackage, userId, false);
@@ -643,7 +657,7 @@
void forceIdleState(String packageName, int userId, boolean idle) {
synchronized (mLock) {
final long timeNow = checkAndGetTimeLocked();
- final long screenOnTime = getScreenOnTimeLocked(timeNow);
+ final long screenOnTime = getScreenOnTimeLocked();
final long deviceUsageTime = screenOnTime - (idle ? mAppIdleDurationMillis : 0) - 5000;
final UserUsageStatsService service =
@@ -657,7 +671,6 @@
timeNow - (idle ? mAppIdleWallclockThresholdMillis : 0) - 5000);
// Inform listeners if necessary
if (previouslyIdle != idle) {
- // Slog.d(TAG, "Informing listeners of out-of-idle " + packageName);
mHandler.sendMessage(mHandler.obtainMessage(MSG_INFORM_LISTENERS, userId,
/* idle = */ idle ? 1 : 0, packageName));
if (!idle) {
@@ -796,7 +809,7 @@
timeNow = checkAndGetTimeLocked();
}
userService = getUserDataAndInitializeIfNeededLocked(userId, timeNow);
- screenOnTime = getScreenOnTimeLocked(timeNow);
+ screenOnTime = getScreenOnTimeLocked();
}
return isAppIdleFiltered(packageName, UserHandle.getAppId(uidForAppId), userId,
userService, timeNow, screenOnTime);
@@ -865,7 +878,7 @@
synchronized (mLock) {
timeNow = checkAndGetTimeLocked();
userService = getUserDataAndInitializeIfNeededLocked(userId, timeNow);
- screenOnTime = getScreenOnTimeLocked(timeNow);
+ screenOnTime = getScreenOnTimeLocked();
}
List<ApplicationInfo> apps;
@@ -987,7 +1000,7 @@
*/
void dump(String[] args, PrintWriter pw) {
synchronized (mLock) {
- final long screenOnTime = getScreenOnTimeLocked(checkAndGetTimeLocked());
+ final long screenOnTime = getScreenOnTimeLocked();
IndentingPrintWriter idpw = new IndentingPrintWriter(pw, " ");
ArraySet<String> argSet = new ArraySet<>();
argSet.addAll(Arrays.asList(args));
@@ -1008,7 +1021,11 @@
}
idpw.decreaseIndent();
}
- pw.println("Screen On Timebase:" + mScreenOnTime);
+ pw.print("Screen On Timebase: ");
+ pw.print(screenOnTime);
+ pw.print(" (");
+ TimeUtils.formatDuration(screenOnTime, pw);
+ pw.println(")");
pw.println();
pw.println("Settings:");
@@ -1042,8 +1059,8 @@
pw.println();
pw.print("mScreenOnTime="); TimeUtils.formatDuration(mScreenOnTime, pw);
pw.println();
- pw.print("mScreenOnSystemTimeSnapshot=");
- TimeUtils.formatDuration(mScreenOnSystemTimeSnapshot, pw);
+ pw.print("mLastScreenOnEventRealtime=");
+ TimeUtils.formatDuration(mLastScreenOnEventRealtime, pw);
pw.println();
}
}
@@ -1078,6 +1095,14 @@
case MSG_CHECK_IDLE_STATES:
checkIdleStates(msg.arg1);
+ mHandler.sendMessageDelayed(mHandler.obtainMessage(
+ MSG_CHECK_IDLE_STATES, msg.arg1, 0),
+ mCheckIdleIntervalMillis);
+ break;
+
+ case MSG_ONE_TIME_CHECK_IDLE_STATES:
+ mHandler.removeMessages(MSG_ONE_TIME_CHECK_IDLE_STATES);
+ checkIdleStates(UserHandle.USER_ALL);
break;
case MSG_CHECK_PAROLE_TIMEOUT:
@@ -1138,7 +1163,7 @@
@Override
public void onChange(boolean selfChange) {
updateSettings();
- postCheckIdleStates(UserHandle.USER_ALL);
+ postOneTimeCheckIdleStates();
}
void updateSettings() {
diff --git a/services/usage/java/com/android/server/usage/UserUsageStatsService.java b/services/usage/java/com/android/server/usage/UserUsageStatsService.java
index aa2cf77..f2045d3 100644
--- a/services/usage/java/com/android/server/usage/UserUsageStatsService.java
+++ b/services/usage/java/com/android/server/usage/UserUsageStatsService.java
@@ -73,6 +73,7 @@
interface StatsUpdatedListener {
void onStatsUpdated();
+ void onStatsReloaded();
long getAppIdleRollingWindowDurationMillis();
}
@@ -523,6 +524,9 @@
mStatsChanged = false;
updateRolloverDeadline();
+
+ // Tell the listener that the stats reloaded, which may have changed idle states.
+ mListener.onStatsReloaded();
}
private void updateRolloverDeadline() {
diff --git a/services/usb/java/com/android/server/usb/MtpNotificationManager.java b/services/usb/java/com/android/server/usb/MtpNotificationManager.java
new file mode 100644
index 0000000..203d35e
--- /dev/null
+++ b/services/usb/java/com/android/server/usb/MtpNotificationManager.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions an
+ * limitations under the License.
+ */
+
+package com.android.server.usb;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.hardware.usb.UsbConstants;
+import android.hardware.usb.UsbDevice;
+import android.hardware.usb.UsbInterface;
+import android.hardware.usb.UsbManager;
+import android.os.UserHandle;
+import android.util.Log;
+
+/**
+ * Manager for MTP storage notification.
+ */
+class MtpNotificationManager {
+ private static final String TAG = "UsbMtpNotificationManager";
+
+ /**
+ * Subclass for PTP.
+ */
+ private static final int SUBCLASS_STILL_IMAGE_CAPTURE = 1;
+
+ /**
+ * Subclass for Android style MTP.
+ */
+ private static final int SUBCLASS_MTP = 0xff;
+
+ /**
+ * Protocol for Picture Transfer Protocol (PIMA 15470).
+ */
+ private static final int PROTOCOL_PTP = 1;
+
+ /**
+ * Protocol for Android style MTP.
+ */
+ private static final int PROTOCOL_MTP = 0;
+
+ private static final String ACTION_OPEN_IN_APPS = "com.android.server.usb.ACTION_OPEN_IN_APPS";
+
+ private final Context mContext;
+ private final OnOpenInAppListener mListener;
+
+ MtpNotificationManager(Context context, OnOpenInAppListener listener) {
+ mContext = context;
+ mListener = listener;
+ final Receiver receiver = new Receiver();
+ context.registerReceiver(receiver, new IntentFilter(ACTION_OPEN_IN_APPS));
+ }
+
+ void showNotification(UsbDevice device) {
+ final Resources resources = mContext.getResources();
+ final String title = resources.getString(
+ com.android.internal.R.string.usb_mtp_launch_notification_title,
+ device.getProductName());
+ final String description = resources.getString(
+ com.android.internal.R.string.usb_mtp_launch_notification_description);
+ final Notification.Builder builder = new Notification.Builder(mContext)
+ .setContentTitle(title)
+ .setContentText(description)
+ .setSmallIcon(com.android.internal.R.drawable.stat_sys_data_usb)
+ .setCategory(Notification.CATEGORY_SYSTEM);
+
+ final Intent intent = new Intent(ACTION_OPEN_IN_APPS);
+ intent.putExtra(UsbManager.EXTRA_DEVICE, device);
+ intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY | Intent.FLAG_RECEIVER_FOREGROUND);
+
+ final PendingIntent openIntent = PendingIntent.getBroadcastAsUser(
+ mContext,
+ device.getDeviceId(),
+ intent,
+ PendingIntent.FLAG_UPDATE_CURRENT,
+ UserHandle.SYSTEM);
+ builder.setContentIntent(openIntent);
+
+ final Notification notification = builder.build();
+ notification.flags |= Notification.FLAG_LOCAL_ONLY;
+
+ mContext.getSystemService(NotificationManager.class).notify(
+ TAG, device.getDeviceId(), notification);
+ }
+
+ void hideNotification(UsbDevice device) {
+ mContext.getSystemService(NotificationManager.class).cancel(TAG, device.getDeviceId());
+ }
+
+ private class Receiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ final UsbDevice device =
+ intent.getExtras().<UsbDevice>getParcelable(UsbManager.EXTRA_DEVICE);
+ if (device == null) {
+ return;
+ }
+ switch (intent.getAction()) {
+ case ACTION_OPEN_IN_APPS:
+ mListener.onOpenInApp(device);
+ break;
+ }
+ }
+ }
+
+ static boolean isMtpDevice(UsbDevice device) {
+ for (int i = 0; i < device.getInterfaceCount(); i++) {
+ final UsbInterface usbInterface = device.getInterface(i);
+ if ((usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_STILL_IMAGE &&
+ usbInterface.getInterfaceSubclass() == SUBCLASS_STILL_IMAGE_CAPTURE &&
+ usbInterface.getInterfaceProtocol() == PROTOCOL_PTP)) {
+ return true;
+ }
+ if (usbInterface.getInterfaceClass() == UsbConstants.USB_SUBCLASS_VENDOR_SPEC &&
+ usbInterface.getInterfaceSubclass() == SUBCLASS_MTP &&
+ usbInterface.getInterfaceProtocol() == PROTOCOL_MTP &&
+ usbInterface.getName().equals("MTP")) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ static interface OnOpenInAppListener {
+ void onOpenInApp(UsbDevice device);
+ }
+}
diff --git a/services/usb/java/com/android/server/usb/UsbSettingsManager.java b/services/usb/java/com/android/server/usb/UsbSettingsManager.java
index 7976cb8..c4d7336 100644
--- a/services/usb/java/com/android/server/usb/UsbSettingsManager.java
+++ b/services/usb/java/com/android/server/usb/UsbSettingsManager.java
@@ -494,6 +494,8 @@
MyPackageMonitor mPackageMonitor = new MyPackageMonitor();
+ private final MtpNotificationManager mMtpNotificationManager;
+
public UsbSettingsManager(Context context, UserHandle user) {
if (DEBUG) Slog.v(TAG, "Creating settings for " + user);
@@ -522,6 +524,14 @@
}
mPackageMonitor.register(mUserContext, null, true);
+ mMtpNotificationManager = new MtpNotificationManager(
+ context,
+ new MtpNotificationManager.OnOpenInAppListener() {
+ @Override
+ public void onOpenInApp(UsbDevice device) {
+ resolveActivity(createDeviceAttachedIntent(device), device);
+ }
+ });
}
private void readPreference(XmlPullParser parser)
@@ -723,10 +733,20 @@
}
public void deviceAttached(UsbDevice device) {
- Intent intent = new Intent(UsbManager.ACTION_USB_DEVICE_ATTACHED);
- intent.putExtra(UsbManager.EXTRA_DEVICE, device);
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ final Intent intent = createDeviceAttachedIntent(device);
+ // Send broadcast to running activity with registered intent
+ mUserContext.sendBroadcast(intent);
+
+ if (MtpNotificationManager.isMtpDevice(device)) {
+ // Show notification if the device is MTP storage.
+ mMtpNotificationManager.showNotification(device);
+ } else {
+ resolveActivity(intent, device);
+ }
+ }
+
+ private void resolveActivity(Intent intent, UsbDevice device) {
ArrayList<ResolveInfo> matches;
String defaultPackage;
synchronized (mLock) {
@@ -736,9 +756,6 @@
defaultPackage = mDevicePreferenceMap.get(new DeviceFilter(device));
}
- // Send broadcast to running activity with registered intent
- mUserContext.sendBroadcast(intent);
-
// Start activity with registered intent
resolveActivity(intent, matches, defaultPackage, device, null);
}
@@ -751,6 +768,10 @@
intent.putExtra(UsbManager.EXTRA_DEVICE, device);
if (DEBUG) Slog.d(TAG, "usbDeviceRemoved, sending " + intent);
mContext.sendBroadcastAsUser(intent, UserHandle.ALL);
+
+ if (MtpNotificationManager.isMtpDevice(device)) {
+ mMtpNotificationManager.hideNotification(device);
+ }
}
public void accessoryAttached(UsbAccessory accessory) {
@@ -1224,4 +1245,11 @@
}
}
}
+
+ private static Intent createDeviceAttachedIntent(UsbDevice device) {
+ Intent intent = new Intent(UsbManager.ACTION_USB_DEVICE_ATTACHED);
+ intent.putExtra(UsbManager.EXTRA_DEVICE, device);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ return intent;
+ }
}
diff --git a/telephony/java/android/telephony/ModemActivityInfo.java b/telephony/java/android/telephony/ModemActivityInfo.java
index c65e8ba..84883d8 100644
--- a/telephony/java/android/telephony/ModemActivityInfo.java
+++ b/telephony/java/android/telephony/ModemActivityInfo.java
@@ -48,7 +48,9 @@
mTimestamp = timestamp;
mSleepTimeMs = sleepTimeMs;
mIdleTimeMs = idleTimeMs;
- System.arraycopy(txTimeMs, 0, mTxTimeMs, 0, Math.min(txTimeMs.length, TX_POWER_LEVELS));
+ if (txTimeMs != null) {
+ System.arraycopy(txTimeMs, 0, mTxTimeMs, 0, Math.min(txTimeMs.length, TX_POWER_LEVELS));
+ }
mRxTimeMs = rxTimeMs;
mEnergyUsed = energyUsed;
}
diff --git a/telephony/java/com/android/internal/telephony/ITelephonyDebug.aidl b/telephony/java/com/android/internal/telephony/ITelephonyDebug.aidl
index 5dffa28..069fcbf 100644
--- a/telephony/java/com/android/internal/telephony/ITelephonyDebug.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephonyDebug.aidl
@@ -16,8 +16,9 @@
package com.android.internal.telephony;
-import android.os.Bundle;
+import com.android.internal.telephony.ITelephonyDebugSubscriber;
+import android.os.Bundle;
/**
* Interface used to interact with the Telephony debug service.
@@ -36,4 +37,7 @@
* @param data optional
*/
void writeEvent(long timestamp, int phoneId, int tag, int param1, int param2, in Bundle data);
+
+ void subscribe(in ITelephonyDebugSubscriber subscriber);
+ void unsubscribe(in ITelephonyDebugSubscriber subscriber);
}
diff --git a/telephony/java/com/android/internal/telephony/ITelephonyDebugSubscriber.aidl b/telephony/java/com/android/internal/telephony/ITelephonyDebugSubscriber.aidl
new file mode 100644
index 0000000..64eb0f1
--- /dev/null
+++ b/telephony/java/com/android/internal/telephony/ITelephonyDebugSubscriber.aidl
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.telephony;
+
+import com.android.internal.telephony.TelephonyEvent;
+
+import android.os.Bundle;
+
+/**
+ * Interface used to subscribe for events from Telephony debug service.
+ *
+ * {@hide}
+ */
+oneway interface ITelephonyDebugSubscriber {
+
+ /**
+ * Called when Telephony debug service has events.
+ */
+ void onEvents(in TelephonyEvent[] events);
+}
diff --git a/telephony/java/com/android/internal/telephony/TelephonyEvent.aidl b/telephony/java/com/android/internal/telephony/TelephonyEvent.aidl
new file mode 100644
index 0000000..1e74b31
--- /dev/null
+++ b/telephony/java/com/android/internal/telephony/TelephonyEvent.aidl
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.telephony;
+
+parcelable TelephonyEvent;
diff --git a/telephony/java/com/android/internal/telephony/TelephonyEvent.java b/telephony/java/com/android/internal/telephony/TelephonyEvent.java
new file mode 100644
index 0000000..26d466d
--- /dev/null
+++ b/telephony/java/com/android/internal/telephony/TelephonyEvent.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.telephony;
+
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * A parcelable used in ITelephonyDebugSubscriber.aidl
+ */
+public class TelephonyEvent implements Parcelable {
+
+ final public long timestamp;
+ final public int phoneId;
+ final public int tag;
+ final public int param1;
+ final public int param2;
+ final public Bundle data;
+
+ public TelephonyEvent(long timestamp, int phoneId, int tag,
+ int param1, int param2, Bundle data) {
+ this.timestamp = timestamp;
+ this.phoneId = phoneId;
+ this.tag = tag;
+ this.param1 = param1;
+ this.param2 = param2;
+ this.data = data;
+ }
+
+ /** Implement the Parcelable interface */
+ public static final Parcelable.Creator<TelephonyEvent> CREATOR
+ = new Parcelable.Creator<TelephonyEvent> (){
+ public TelephonyEvent createFromParcel(Parcel source) {
+ final long timestamp = source.readLong();
+ final int phoneId = source.readInt();
+ final int tag = source.readInt();
+ final int param1 = source.readInt();
+ final int param2 = source.readInt();
+ final Bundle data = source.readBundle();
+ return new TelephonyEvent(timestamp, phoneId, tag, param1, param2, data);
+ }
+
+ public TelephonyEvent[] newArray(int size) {
+ return new TelephonyEvent[size];
+ }
+ };
+
+ /** Implement the Parcelable interface */
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ /** Implement the Parcelable interface */
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeLong(timestamp);
+ dest.writeInt(phoneId);
+ dest.writeInt(tag);
+ dest.writeInt(param1);
+ dest.writeInt(param2);
+ dest.writeBundle(data);
+ }
+
+ public String toString() {
+ return String.format("%d,%d,%d,%d,%d,%s",
+ timestamp, phoneId, tag, param1, param2, data);
+ }
+}
diff --git a/test-runner/src/android/test/ActivityInstrumentationTestCase.java b/test-runner/src/android/test/ActivityInstrumentationTestCase.java
index a59ee35..aca1c16 100644
--- a/test-runner/src/android/test/ActivityInstrumentationTestCase.java
+++ b/test-runner/src/android/test/ActivityInstrumentationTestCase.java
@@ -23,15 +23,15 @@
* be created using the system infrastructure (by calling InstrumentationTestCase.launchActivity())
* and you will then be able to manipulate your Activity directly. Most of the work is handled
* automatically here by {@link #setUp} and {@link #tearDown}.
- *
+ *
* <p>If you prefer an isolated unit test, see {@link android.test.ActivityUnitTestCase}.
- *
- * @deprecated new tests should be written using
+ *
+ * @deprecated new tests should be written using
* {@link android.test.ActivityInstrumentationTestCase2}, which provides more options for
* configuring the Activity under test
*/
@Deprecated
-public abstract class ActivityInstrumentationTestCase<T extends Activity>
+public abstract class ActivityInstrumentationTestCase<T extends Activity>
extends ActivityTestCase {
String mPackage;
Class<T> mActivityClass;
@@ -39,7 +39,7 @@
/**
* Creates an {@link ActivityInstrumentationTestCase} in non-touch mode.
- *
+ *
* @param pkg ignored - no longer in use.
* @param activityClass The activity to test. This must be a class in the instrumentation
* targetPackage specified in the AndroidManifest.xml
@@ -56,7 +56,7 @@
* targetPackage specified in the AndroidManifest.xml
* @param initialTouchMode true = in touch mode
*/
- public ActivityInstrumentationTestCase(String pkg, Class<T> activityClass,
+ public ActivityInstrumentationTestCase(String pkg, Class<T> activityClass,
boolean initialTouchMode) {
mActivityClass = activityClass;
mInitialTouchMode = initialTouchMode;
@@ -80,8 +80,8 @@
protected void tearDown() throws Exception {
getActivity().finish();
setActivity(null);
-
- // Scrub out members - protects against memory leaks in the case where someone
+
+ // Scrub out members - protects against memory leaks in the case where someone
// creates a non-static inner class (thus referencing the test case) and gives it to
// someone else to hold onto
scrubClass(ActivityInstrumentationTestCase.class);
diff --git a/test-runner/src/android/test/ActivityInstrumentationTestCase2.java b/test-runner/src/android/test/ActivityInstrumentationTestCase2.java
index c4bcf31..0e61ce7 100644
--- a/test-runner/src/android/test/ActivityInstrumentationTestCase2.java
+++ b/test-runner/src/android/test/ActivityInstrumentationTestCase2.java
@@ -25,26 +25,26 @@
* This class provides functional testing of a single activity. The activity under test will
* be created using the system infrastructure (by calling InstrumentationTestCase.launchActivity())
* and you will then be able to manipulate your Activity directly.
- *
+ *
* <p>Other options supported by this test case include:
* <ul>
* <li>You can run any test method on the UI thread (see {@link android.test.UiThreadTest}).</li>
- * <li>You can inject custom Intents into your Activity (see
+ * <li>You can inject custom Intents into your Activity (see
* {@link #setActivityIntent(Intent)}).</li>
* </ul>
- *
+ *
* <p>This class replaces {@link android.test.ActivityInstrumentationTestCase}, which is deprecated.
* New tests should be written using this base class.
- *
+ *
* <p>If you prefer an isolated unit test, see {@link android.test.ActivityUnitTestCase}.
*
- * <div class="special reference">
- * <h3>Developer Guides</h3>
- * <p>For more information about application testing, read the
- * <a href="{@docRoot}guide/topics/testing/index.html">Testing</a> developer guide.</p>
- * </div>
+ * @deprecated Use
+ * <a href="{@docRoot}reference/android/support/test/rule/ActivityTestRule.html">
+ * ActivityTestRule</a> instead. New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
-public abstract class ActivityInstrumentationTestCase2<T extends Activity>
+@Deprecated
+public abstract class ActivityInstrumentationTestCase2<T extends Activity>
extends ActivityTestCase {
Class<T> mActivityClass;
boolean mInitialTouchMode = false;
@@ -78,18 +78,18 @@
* Get the Activity under test, starting it if necessary.
*
* For each test method invocation, the Activity will not actually be created until the first
- * time this method is called.
- *
- * <p>If you wish to provide custom setup values to your Activity, you may call
- * {@link #setActivityIntent(Intent)} and/or {@link #setActivityInitialTouchMode(boolean)}
- * before your first call to getActivity(). Calling them after your Activity has
+ * time this method is called.
+ *
+ * <p>If you wish to provide custom setup values to your Activity, you may call
+ * {@link #setActivityIntent(Intent)} and/or {@link #setActivityInitialTouchMode(boolean)}
+ * before your first call to getActivity(). Calling them after your Activity has
* started will have no effect.
*
* <p><b>NOTE:</b> Activities under test may not be started from within the UI thread.
* If your test method is annotated with {@link android.test.UiThreadTest}, then your Activity
* will be started automatically just before your test method is run. You still call this
* method in order to get the Activity under test.
- *
+ *
* @return the Activity under test
*/
@Override
@@ -113,10 +113,10 @@
/**
* Call this method before the first call to {@link #getActivity} to inject a customized Intent
* into the Activity under test.
- *
+ *
* <p>If you do not call this, the default intent will be provided. If you call this after
* your Activity has been started, it will have no effect.
- *
+ *
* <p><b>NOTE:</b> Activities under test may not be started from within the UI thread.
* If your test method is annotated with {@link android.test.UiThreadTest}, then you must call
* {@link #setActivityIntent(Intent)} from {@link #setUp()}.
@@ -131,28 +131,28 @@
public void setActivityIntent(Intent i) {
mActivityIntent = i;
}
-
+
/**
* Call this method before the first call to {@link #getActivity} to set the initial touch
* mode for the Activity under test.
- *
+ *
* <p>If you do not call this, the touch mode will be false. If you call this after
* your Activity has been started, it will have no effect.
- *
+ *
* <p><b>NOTE:</b> Activities under test may not be started from within the UI thread.
* If your test method is annotated with {@link android.test.UiThreadTest}, then you must call
* {@link #setActivityInitialTouchMode(boolean)} from {@link #setUp()}.
- *
+ *
* @param initialTouchMode true if the Activity should be placed into "touch mode" when started
*/
public void setActivityInitialTouchMode(boolean initialTouchMode) {
mInitialTouchMode = initialTouchMode;
}
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
-
+
mInitialTouchMode = false;
mActivityIntent = null;
}
@@ -165,8 +165,8 @@
a.finish();
setActivity(null);
}
-
- // Scrub out members - protects against memory leaks in the case where someone
+
+ // Scrub out members - protects against memory leaks in the case where someone
// creates a non-static inner class (thus referencing the test case) and gives it to
// someone else to hold onto
scrubClass(ActivityInstrumentationTestCase2.class);
diff --git a/test-runner/src/android/test/ActivityTestCase.java b/test-runner/src/android/test/ActivityTestCase.java
index c7b1d70..51dd3ef 100644
--- a/test-runner/src/android/test/ActivityTestCase.java
+++ b/test-runner/src/android/test/ActivityTestCase.java
@@ -25,7 +25,11 @@
* This is common code used to support Activity test cases. For more useful classes, please see
* {@link android.test.ActivityUnitTestCase} and
* {@link android.test.ActivityInstrumentationTestCase}.
+ *
+ * @deprecated New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public abstract class ActivityTestCase extends InstrumentationTestCase {
/**
diff --git a/test-runner/src/android/test/ActivityUnitTestCase.java b/test-runner/src/android/test/ActivityUnitTestCase.java
index 40cca90..a191445 100644
--- a/test-runner/src/android/test/ActivityUnitTestCase.java
+++ b/test-runner/src/android/test/ActivityUnitTestCase.java
@@ -32,14 +32,14 @@
/**
* This class provides isolated testing of a single activity. The activity under test will
- * be created with minimal connection to the system infrastructure, and you can inject mocked or
+ * be created with minimal connection to the system infrastructure, and you can inject mocked or
* wrappered versions of many of Activity's dependencies. Most of the work is handled
* automatically here by {@link #setUp} and {@link #tearDown}.
- *
+ *
* <p>If you prefer a functional test, see {@link android.test.ActivityInstrumentationTestCase}.
- *
+ *
* <p>It must be noted that, as a true unit test, your Activity will not be running in the
- * normal system and will not participate in the normal interactions with other Activities.
+ * normal system and will not participate in the normal interactions with other Activities.
* The following methods should not be called in this configuration - most of them will throw
* exceptions:
* <ul>
@@ -54,17 +54,17 @@
* <li>{@link android.app.Activity#isTaskRoot()}</li>
* <li>{@link android.app.Activity#moveTaskToBack(boolean)}</li>
* </ul>
- *
- * <p>The following methods may be called but will not do anything. For test purposes, you can use
- * the methods {@link #getStartedActivityIntent()} and {@link #getStartedActivityRequest()} to
+ *
+ * <p>The following methods may be called but will not do anything. For test purposes, you can use
+ * the methods {@link #getStartedActivityIntent()} and {@link #getStartedActivityRequest()} to
* inspect the parameters that they were called with.
* <ul>
* <li>{@link android.app.Activity#startActivity(Intent)}</li>
* <li>{@link android.app.Activity#startActivityForResult(Intent, int)}</li>
* </ul>
*
- * <p>The following methods may be called but will not do anything. For test purposes, you can use
- * the methods {@link #isFinishCalled()} and {@link #getFinishedActivityRequest()} to inspect the
+ * <p>The following methods may be called but will not do anything. For test purposes, you can use
+ * the methods {@link #isFinishCalled()} and {@link #getFinishedActivityRequest()} to inspect the
* parameters that they were called with.
* <ul>
* <li>{@link android.app.Activity#finish()}</li>
@@ -72,8 +72,12 @@
* <li>{@link android.app.Activity#finishActivity(int requestCode)}</li>
* </ul>
*
+ * @deprecated Write
+ * <a href="{@docRoot}training/testing/unit-testing/local-unit-tests.html">Local Unit Tests</a>
+ * instead.
*/
-public abstract class ActivityUnitTestCase<T extends Activity>
+@Deprecated
+public abstract class ActivityUnitTestCase<T extends Activity>
extends ActivityTestCase {
private static final String TAG = "ActivityUnitTestCase";
@@ -102,31 +106,31 @@
// default value for target context, as a default
mActivityContext = getInstrumentation().getTargetContext();
}
-
+
/**
* Start the activity under test, in the same way as if it was started by
- * {@link android.content.Context#startActivity Context.startActivity()}, providing the
+ * {@link android.content.Context#startActivity Context.startActivity()}, providing the
* arguments it supplied. When you use this method to start the activity, it will automatically
* be stopped by {@link #tearDown}.
- *
- * <p>This method will call onCreate(), but if you wish to further exercise Activity life
+ *
+ * <p>This method will call onCreate(), but if you wish to further exercise Activity life
* cycle methods, you must call them yourself from your test case.
- *
+ *
* <p><i>Do not call from your setUp() method. You must call this method from each of your
* test methods.</i>
- *
+ *
* @param intent The Intent as if supplied to {@link android.content.Context#startActivity}.
* @param savedInstanceState The instance state, if you are simulating this part of the life
* cycle. Typically null.
- * @param lastNonConfigurationInstance This Object will be available to the
- * Activity if it calls {@link android.app.Activity#getLastNonConfigurationInstance()}.
+ * @param lastNonConfigurationInstance This Object will be available to the
+ * Activity if it calls {@link android.app.Activity#getLastNonConfigurationInstance()}.
* Typically null.
* @return Returns the Activity that was created
*/
protected T startActivity(Intent intent, Bundle savedInstanceState,
Object lastNonConfigurationInstance) {
assertFalse("Activity already created", mCreated);
-
+
if (!mAttached) {
assertNotNull(mActivityClass);
setActivity(null);
@@ -154,7 +158,7 @@
assertNotNull(newActivity);
setActivity(newActivity);
-
+
mAttached = true;
}
@@ -165,22 +169,22 @@
}
return result;
}
-
+
@Override
protected void tearDown() throws Exception {
-
+
setActivity(null);
-
- // Scrub out members - protects against memory leaks in the case where someone
+
+ // Scrub out members - protects against memory leaks in the case where someone
// creates a non-static inner class (thus referencing the test case) and gives it to
// someone else to hold onto
scrubClass(ActivityInstrumentationTestCase.class);
super.tearDown();
}
-
+
/**
- * Set the application for use during the test. You must call this function before calling
+ * Set the application for use during the test. You must call this function before calling
* {@link #startActivity}. If your test does not call this method,
* @param application The Application object that will be injected into the Activity under test.
*/
@@ -198,7 +202,7 @@
}
/**
- * This method will return the value if your Activity under test calls
+ * This method will return the value if your Activity under test calls
* {@link android.app.Activity#setRequestedOrientation}.
*/
public int getRequestedOrientation() {
@@ -207,10 +211,10 @@
}
return 0;
}
-
+
/**
- * This method will return the launch intent if your Activity under test calls
- * {@link android.app.Activity#startActivity(Intent)} or
+ * This method will return the launch intent if your Activity under test calls
+ * {@link android.app.Activity#startActivity(Intent)} or
* {@link android.app.Activity#startActivityForResult(Intent, int)}.
* @return The Intent provided in the start call, or null if no start call was made.
*/
@@ -220,9 +224,9 @@
}
return null;
}
-
+
/**
- * This method will return the launch request code if your Activity under test calls
+ * This method will return the launch request code if your Activity under test calls
* {@link android.app.Activity#startActivityForResult(Intent, int)}.
* @return The request code provided in the start call, or -1 if no start call was made.
*/
@@ -234,9 +238,9 @@
}
/**
- * This method will notify you if the Activity under test called
- * {@link android.app.Activity#finish()},
- * {@link android.app.Activity#finishFromChild(Activity)}, or
+ * This method will notify you if the Activity under test called
+ * {@link android.app.Activity#finish()},
+ * {@link android.app.Activity#finishFromChild(Activity)}, or
* {@link android.app.Activity#finishActivity(int)}.
* @return Returns true if one of the listed finish methods was called.
*/
@@ -246,9 +250,9 @@
}
return false;
}
-
+
/**
- * This method will return the request code if the Activity under test called
+ * This method will return the request code if the Activity under test called
* {@link android.app.Activity#finishActivity(int)}.
* @return The request code provided in the start call, or -1 if no finish call was made.
*/
@@ -258,7 +262,7 @@
}
return 0;
}
-
+
/**
* This mock Activity represents the "parent" activity. By injecting this, we allow the user
* to call a few more Activity methods, including:
@@ -269,7 +273,7 @@
* <li>{@link android.app.Activity#finishActivity(int requestCode)}</li>
* <li>{@link android.app.Activity#finishFromChild(Activity child)}</li>
* </ul>
- *
+ *
* TODO: Make this overrideable, and the unit test can look for calls to other methods
*/
private static class MockParent extends Activity {
@@ -303,7 +307,7 @@
public Window getWindow() {
return null;
}
-
+
/**
* By defining this in the parent, we allow the tested activity to call
* <ul>
@@ -316,7 +320,7 @@
mStartedActivityIntent = intent;
mStartedActivityRequest = requestCode;
}
-
+
/**
* By defining this in the parent, we allow the tested activity to call
* <ul>
diff --git a/test-runner/src/android/test/AndroidTestRunner.java b/test-runner/src/android/test/AndroidTestRunner.java
index aa7c677..50eaafb 100644
--- a/test-runner/src/android/test/AndroidTestRunner.java
+++ b/test-runner/src/android/test/AndroidTestRunner.java
@@ -33,6 +33,13 @@
import java.lang.reflect.InvocationTargetException;
import java.util.List;
+/**
+ * @deprecated Use
+ * <a href="{@docRoot}reference/android/support/test/runner/AndroidJUnitRunner.html">
+ * AndroidJUnitRunner</a> instead. New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
+ */
+@Deprecated
public class AndroidTestRunner extends BaseTestRunner {
private TestResult mTestResult;
diff --git a/test-runner/src/android/test/ApplicationTestCase.java b/test-runner/src/android/test/ApplicationTestCase.java
index f093181..4d73f53 100644
--- a/test-runner/src/android/test/ApplicationTestCase.java
+++ b/test-runner/src/android/test/ApplicationTestCase.java
@@ -32,7 +32,7 @@
* In order to support the lifecycle of a Application, this test case will make the
* following calls at the following times.
*
- * <ul><li>The test case will not call onCreate() until your test calls
+ * <ul><li>The test case will not call onCreate() until your test calls
* {@link #createApplication()}. This gives you a chance
* to set up or adjust any additional framework or test logic before
* onCreate().</li>
@@ -40,22 +40,28 @@
* automatically called, and it will stop & destroy your application by calling its
* onDestroy() method.</li>
* </ul>
- *
+ *
* <p><b>Dependency Injection.</b>
* Every Application has one inherent dependency, the {@link android.content.Context Context} in
* which it runs.
- * This framework allows you to inject a modified, mock, or isolated replacement for this
+ * This framework allows you to inject a modified, mock, or isolated replacement for this
* dependencies, and thus perform a true unit test.
- *
+ *
* <p>If simply run your tests as-is, your Application will be injected with a fully-functional
* Context.
- * You can create and inject alternative types of Contexts by calling
+ * You can create and inject alternative types of Contexts by calling
* {@link AndroidTestCase#setContext(Context) setContext()}. You must do this <i>before</i> calling
* {@link #createApplication()}. The test framework provides a
- * number of alternatives for Context, including {@link android.test.mock.MockContext MockContext},
- * {@link android.test.RenamingDelegatingContext RenamingDelegatingContext}, and
+ * number of alternatives for Context, including {@link android.test.mock.MockContext MockContext},
+ * {@link android.test.RenamingDelegatingContext RenamingDelegatingContext}, and
* {@link android.content.ContextWrapper ContextWrapper}.
+ *
+ * @deprecated Use
+ * <a href="{@docRoot}reference/android/support/test/InstrumentationRegistry.html">
+ * InstrumentationRegistry</a> instead. New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public abstract class ApplicationTestCase<T extends Application> extends AndroidTestCase {
Class<T> mApplicationClass;
@@ -78,17 +84,17 @@
}
/**
- * This will do the work to instantiate the Application under test. After this, your test
+ * This will do the work to instantiate the Application under test. After this, your test
* code must also start and stop the Application.
*/
@Override
protected void setUp() throws Exception {
super.setUp();
-
+
// get the real context, before the individual tests have a chance to muck with it
mSystemContext = getContext();
}
-
+
/**
* Load and attach the application under test.
*/
@@ -101,26 +107,26 @@
}
mAttached = true;
}
-
+
/**
- * Start the Application under test, in the same way as if it was started by the system.
+ * Start the Application under test, in the same way as if it was started by the system.
* If you use this method to start the Application, it will automatically
* be stopped by {@link #tearDown}. If you wish to inject a specialized Context for your
- * test, by calling {@link AndroidTestCase#setContext(Context) setContext()},
+ * test, by calling {@link AndroidTestCase#setContext(Context) setContext()},
* you must do so before calling this method.
*/
final protected void createApplication() {
assertFalse(mCreated);
-
+
if (!mAttached) {
setupApplication();
}
assertNotNull(mApplication);
-
+
mApplication.onCreate();
mCreated = true;
}
-
+
/**
* This will make the necessary calls to terminate the Application under test (it will
* call onTerminate(). Ordinarily this will be called automatically (by {@link #tearDown}, but
@@ -131,13 +137,13 @@
mApplication.onTerminate();
}
}
-
+
/**
- * Shuts down the Application under test. Also makes sure all resources are cleaned up and
+ * Shuts down the Application under test. Also makes sure all resources are cleaned up and
* garbage collected before moving on to the next
* test. Subclasses that override this method should make sure they call super.tearDown()
* at the end of the overriding method.
- *
+ *
* @throws Exception
*/
@Override
@@ -145,7 +151,7 @@
terminateApplication();
mApplication = null;
- // Scrub out members - protects against memory leaks in the case where someone
+ // Scrub out members - protects against memory leaks in the case where someone
// creates a non-static inner class (thus referencing the test case) and gives it to
// someone else to hold onto
scrubClass(ApplicationTestCase.class);
@@ -156,7 +162,7 @@
/**
* Return a real (not mocked or instrumented) system Context that can be used when generating
* Mock or other Context objects for your Application under test.
- *
+ *
* @return Returns a reference to a normal Context.
*/
public Context getSystemContext() {
@@ -165,7 +171,7 @@
/**
* This test simply confirms that the Application class can be instantiated properly.
- *
+ *
* @throws Exception
*/
final public void testApplicationTestCaseSetUpProperly() throws Exception {
diff --git a/test-runner/src/android/test/AssertionFailedError.java b/test-runner/src/android/test/AssertionFailedError.java
index b3ac6d1..fc3e98e 100644
--- a/test-runner/src/android/test/AssertionFailedError.java
+++ b/test-runner/src/android/test/AssertionFailedError.java
@@ -18,17 +18,18 @@
/**
* Thrown when an assertion failed.
- *
+ *
* @deprecated use junit.framework.AssertionFailedError
*/
+@Deprecated
public class AssertionFailedError extends Error {
-
+
/**
* It is more typical to call {@link #AssertionFailedError(String)}.
*/
public AssertionFailedError() {
}
-
+
public AssertionFailedError(String errorMessage) {
super(errorMessage);
}
diff --git a/test-runner/src/android/test/ClassPathPackageInfo.java b/test-runner/src/android/test/ClassPathPackageInfo.java
index 1f6e647..1ab7c7f 100644
--- a/test-runner/src/android/test/ClassPathPackageInfo.java
+++ b/test-runner/src/android/test/ClassPathPackageInfo.java
@@ -24,9 +24,10 @@
/**
* The Package object doesn't allow you to iterate over the contained
* classes and subpackages of that package. This is a version that does.
- *
+ *
* {@hide} Not needed for 1.0 SDK.
*/
+@Deprecated
public class ClassPathPackageInfo {
private final ClassPathPackageInfoSource source;
diff --git a/test-runner/src/android/test/ClassPathPackageInfoSource.java b/test-runner/src/android/test/ClassPathPackageInfoSource.java
index 0ffecdb..89bb494 100644
--- a/test-runner/src/android/test/ClassPathPackageInfoSource.java
+++ b/test-runner/src/android/test/ClassPathPackageInfoSource.java
@@ -33,9 +33,10 @@
/**
* Generate {@link ClassPathPackageInfo}s by scanning apk paths.
- *
+ *
* {@hide} Not needed for 1.0 SDK.
*/
+@Deprecated
public class ClassPathPackageInfoSource {
private static final String CLASS_EXTENSION = ".class";
@@ -82,7 +83,7 @@
// Don't try to load classes that are generated. They usually aren't in test apks.
continue;
}
-
+
try {
// We get errors in the emulator if we don't use the caller's class loader.
topLevelClasses.add(Class.forName(className, false,
diff --git a/test-runner/src/android/test/DatabaseTestUtils.java b/test-runner/src/android/test/DatabaseTestUtils.java
index 23e0aba..42ef48b 100644
--- a/test-runner/src/android/test/DatabaseTestUtils.java
+++ b/test-runner/src/android/test/DatabaseTestUtils.java
@@ -27,6 +27,7 @@
* A collection of utilities for writing unit tests for database code.
* @hide pending API council approval
*/
+@Deprecated
public class DatabaseTestUtils {
/**
diff --git a/test-runner/src/android/test/InstrumentationCoreTestRunner.java b/test-runner/src/android/test/InstrumentationCoreTestRunner.java
index 655a65c..2b05e4a 100644
--- a/test-runner/src/android/test/InstrumentationCoreTestRunner.java
+++ b/test-runner/src/android/test/InstrumentationCoreTestRunner.java
@@ -41,6 +41,7 @@
*
* @hide
*/
+@Deprecated
public class InstrumentationCoreTestRunner extends InstrumentationTestRunner {
/**
diff --git a/test-runner/src/android/test/InstrumentationTestRunner.java b/test-runner/src/android/test/InstrumentationTestRunner.java
index db80ef951..9bd4c96 100644
--- a/test-runner/src/android/test/InstrumentationTestRunner.java
+++ b/test-runner/src/android/test/InstrumentationTestRunner.java
@@ -155,6 +155,10 @@
* -e coverageFile /sdcard/myFile.ec
* <br/>
* in addition to the other arguments.
+ * @deprecated Use
+ * <a href="{@docRoot}reference/android/support/test/runner/AndroidJUnitRunner.html">
+ * AndroidJUnitRunner</a> instead. New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
/* (not JavaDoc)
@@ -170,6 +174,7 @@
*
* This model is used by many existing app tests, but can probably be deprecated.
*/
+@Deprecated
public class InstrumentationTestRunner extends Instrumentation implements TestSuiteProvider {
/** @hide */
diff --git a/test-runner/src/android/test/InstrumentationUtils.java b/test-runner/src/android/test/InstrumentationUtils.java
index 1a7002a..cc50813 100644
--- a/test-runner/src/android/test/InstrumentationUtils.java
+++ b/test-runner/src/android/test/InstrumentationUtils.java
@@ -17,17 +17,17 @@
package android.test;
/**
- *
* The InstrumentationUtils class has all the utility functions needed for
* instrumentation tests.
*
* {@hide} - Not currently used.
*/
+@Deprecated
public class InstrumentationUtils {
/**
* An utility function that returns the menu identifier for a particular
* menu item.
- *
+ *
* @param cls Class object of the class that handles the menu ite,.
* @param identifier Menu identifier.
* @return The integer corresponding to the menu item.
@@ -35,7 +35,7 @@
public static int getMenuIdentifier(Class cls, String identifier) {
int id = -1;
try {
- Integer field = (Integer)cls.getDeclaredField(identifier).get(cls);
+ Integer field = (Integer)cls.getDeclaredField(identifier).get(cls);
id = field.intValue();
} catch (NoSuchFieldException e) {
e.printStackTrace();
diff --git a/test-runner/src/android/test/IsolatedContext.java b/test-runner/src/android/test/IsolatedContext.java
index f971b5d..3abf38f 100644
--- a/test-runner/src/android/test/IsolatedContext.java
+++ b/test-runner/src/android/test/IsolatedContext.java
@@ -43,9 +43,13 @@
/**
- * A mock context which prevents its users from talking to the rest of the device while
+ * A mock context which prevents its users from talking to the rest of the device while
* stubbing enough methods to satify code that tries to talk to other packages.
+ *
+ * @deprecated New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public class IsolatedContext extends ContextWrapper {
private ContentResolver mResolver;
diff --git a/test-runner/src/android/test/LaunchPerformanceBase.java b/test-runner/src/android/test/LaunchPerformanceBase.java
index d423e62..62c90d6 100644
--- a/test-runner/src/android/test/LaunchPerformanceBase.java
+++ b/test-runner/src/android/test/LaunchPerformanceBase.java
@@ -26,6 +26,7 @@
*
* @hide
*/
+@Deprecated
public class LaunchPerformanceBase extends Instrumentation {
public static final String LOG_TAG = "Launch Performance";
@@ -39,7 +40,7 @@
mIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
setAutomaticPerformanceSnapshots();
}
-
+
/**
* Launches intent, and waits for idle before returning.
*
diff --git a/test-runner/src/android/test/MoreAsserts.java b/test-runner/src/android/test/MoreAsserts.java
index 3364895..d33911a 100644
--- a/test-runner/src/android/test/MoreAsserts.java
+++ b/test-runner/src/android/test/MoreAsserts.java
@@ -30,7 +30,10 @@
/**
* Contains additional assertion methods not found in JUnit.
+ * @deprecated Use
+ * <a href="https://github.com/hamcrest">Hamcrest matchers</a> instead.
*/
+@Deprecated
public final class MoreAsserts {
private MoreAsserts() { }
@@ -375,7 +378,7 @@
failWithMessage(message, "Extra object in actual: (" + actualObj.toString() + ")");
}
}
-
+
if (expectedMap.size() > 0) {
failWithMessage(message, "Extra objects in expected.");
}
diff --git a/test-runner/src/android/test/NoExecTestResult.java b/test-runner/src/android/test/NoExecTestResult.java
index 1ee62c1..a01b6aa 100644
--- a/test-runner/src/android/test/NoExecTestResult.java
+++ b/test-runner/src/android/test/NoExecTestResult.java
@@ -19,11 +19,12 @@
import junit.framework.TestResult;
/**
- * A benign test result that does no actually test execution, just runs
+ * A benign test result that does no actually test execution, just runs
* through the motions
- *
+ *
* {@hide} Not needed for SDK.
*/
+@Deprecated
class NoExecTestResult extends TestResult {
/**
diff --git a/test-runner/src/android/test/PackageInfoSources.java b/test-runner/src/android/test/PackageInfoSources.java
index ef37449..205f86b 100644
--- a/test-runner/src/android/test/PackageInfoSources.java
+++ b/test-runner/src/android/test/PackageInfoSources.java
@@ -19,6 +19,7 @@
/**
* {@hide} Not needed for SDK.
*/
+@Deprecated
public class PackageInfoSources {
private static ClassPathPackageInfoSource classPathSource;
diff --git a/test-runner/src/android/test/PerformanceCollectorTestCase.java b/test-runner/src/android/test/PerformanceCollectorTestCase.java
index 4309ff7..3a5dafc 100644
--- a/test-runner/src/android/test/PerformanceCollectorTestCase.java
+++ b/test-runner/src/android/test/PerformanceCollectorTestCase.java
@@ -30,6 +30,7 @@
*
* {@hide} Not needed for SDK.
*/
+@Deprecated
public interface PerformanceCollectorTestCase {
public PerformanceCollector mPerfCollector = new PerformanceCollector();
diff --git a/test-runner/src/android/test/RenamingDelegatingContext.java b/test-runner/src/android/test/RenamingDelegatingContext.java
index 3c4da9e..36786b0 100644
--- a/test-runner/src/android/test/RenamingDelegatingContext.java
+++ b/test-runner/src/android/test/RenamingDelegatingContext.java
@@ -36,7 +36,11 @@
* This is a class which delegates to the given context, but performs database
* and file operations with a renamed database/file name (prefixes default
* names with a given prefix).
+ *
+ * @deprecated New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public class RenamingDelegatingContext extends ContextWrapper {
private Context mFileContext;
@@ -168,7 +172,7 @@
return false;
}
}
-
+
@Override
public File getDatabasePath(String name) {
return mFileContext.getDatabasePath(renamedFileName(name));
@@ -216,7 +220,7 @@
public String[] fileList() {
return mFileNames.toArray(new String[]{});
}
-
+
/**
* In order to support calls to getCacheDir(), we create a temp cache dir (inside the real
* one) and return it instead. This code is basically getCacheDir(), except it uses the real
@@ -241,21 +245,4 @@
}
return mCacheDir;
}
-
-
-// /**
-// * Given an array of files returns only those whose names indicate that they belong to this
-// * context.
-// * @param allFiles the original list of files
-// * @return the pruned list of files
-// */
-// private String[] prunedFileList(String[] allFiles) {
-// List<String> files = Lists.newArrayList();
-// for (String file : allFiles) {
-// if (file.startsWith(mFilePrefix)) {
-// files.add(file);
-// }
-// }
-// return files.toArray(new String[]{});
-// }
}
diff --git a/test-runner/src/android/test/ServiceTestCase.java b/test-runner/src/android/test/ServiceTestCase.java
index ba20c09..c8ff0f9 100644
--- a/test-runner/src/android/test/ServiceTestCase.java
+++ b/test-runner/src/android/test/ServiceTestCase.java
@@ -92,7 +92,13 @@
* {@link android.test.RenamingDelegatingContext RenamingDelegatingContext},
* {@link android.content.ContextWrapper ContextWrapper}, and
* {@link android.test.IsolatedContext}.
+ *
+ * @deprecated Use
+ * <a href="{@docRoot}reference/android/support/test/rule/ServiceTestRule.html">
+ * ServiceTestRule</a> instead. New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public abstract class ServiceTestCase<T extends Service> extends AndroidTestCase {
Class<T> mServiceClass;
diff --git a/test-runner/src/android/test/SimpleCache.java b/test-runner/src/android/test/SimpleCache.java
index 44424ec..46143e4 100644
--- a/test-runner/src/android/test/SimpleCache.java
+++ b/test-runner/src/android/test/SimpleCache.java
@@ -19,6 +19,7 @@
import java.util.HashMap;
import java.util.Map;
+@Deprecated
abstract class SimpleCache<K, V> {
private Map<K, V> map = new HashMap<K, V>();
diff --git a/test-runner/src/android/test/SingleLaunchActivityTestCase.java b/test-runner/src/android/test/SingleLaunchActivityTestCase.java
index 72c93ce..af1448e 100644
--- a/test-runner/src/android/test/SingleLaunchActivityTestCase.java
+++ b/test-runner/src/android/test/SingleLaunchActivityTestCase.java
@@ -22,13 +22,19 @@
* If you would like to test a single activity with an
* {@link android.test.InstrumentationTestCase}, this provides some of the boiler plate to
* launch and finish the activity in {@link #setUp} and {@link #tearDown}.
- *
- * This launches the activity only once for the entire class instead of doing it
+ *
+ * This launches the activity only once for the entire class instead of doing it
* in every setup / teardown call.
+ *
+ * @deprecated Use
+ * <a href="{@docRoot}reference/android/support/test/rule/ActivityTestRule.html">
+ * ActivityTestRule</a> instead. New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public abstract class SingleLaunchActivityTestCase<T extends Activity>
extends InstrumentationTestCase {
-
+
String mPackage;
Class<T> mActivityClass;
private static int sTestCaseCounter = 0;
@@ -44,10 +50,10 @@
*/
public SingleLaunchActivityTestCase(String pkg, Class<T> activityClass) {
mPackage = pkg;
- mActivityClass = activityClass;
- sTestCaseCounter ++;
+ mActivityClass = activityClass;
+ sTestCaseCounter ++;
}
-
+
/**
* The activity that will be set up for use in each test method.
*/
@@ -66,7 +72,7 @@
getInstrumentation().setInTouchMode(false);
sActivity = launchActivity(mPackage, mActivityClass, null);
sActivityLaunchedFlag = true;
- }
+ }
}
@Override
@@ -75,7 +81,7 @@
sTestCaseCounter --;
if (sTestCaseCounter == 0) {
sActivity.finish();
- }
+ }
super.tearDown();
}
diff --git a/test-runner/src/android/test/SyncBaseInstrumentation.java b/test-runner/src/android/test/SyncBaseInstrumentation.java
index 7d418f0..de36b4f 100644
--- a/test-runner/src/android/test/SyncBaseInstrumentation.java
+++ b/test-runner/src/android/test/SyncBaseInstrumentation.java
@@ -27,7 +27,13 @@
* If you would like to test sync a single provider with an
* {@link InstrumentationTestCase}, this provides some of the boiler plate in {@link #setUp} and
* {@link #tearDown}.
+ *
+ * @deprecated Use
+ * <a href="{@docRoot}reference/android/support/test/InstrumentationRegistry.html">
+ * InstrumentationRegistry</a> instead. New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public class SyncBaseInstrumentation extends InstrumentationTestCase {
private Context mTargetContext;
ContentResolver mContentResolver;
diff --git a/test-runner/src/android/test/TestCase.java b/test-runner/src/android/test/TestCase.java
index 5432ce8..b234f44 100644
--- a/test-runner/src/android/test/TestCase.java
+++ b/test-runner/src/android/test/TestCase.java
@@ -23,14 +23,13 @@
* More complex interface for test cases.
*
* <p>Just implementing Runnable is enough for many test cases. If you
- * have additional setup or teardown, this interface might be for you,
+ * have additional setup or teardown, this interface might be for you,
* especially if you need to share it between different test cases, or your
* teardown code must execute regardless of whether your test passed.
*
* <p>See the android.test package documentation (click the more... link)
* for a full description
*/
-
@Deprecated
public interface TestCase extends Runnable
{
diff --git a/test-runner/src/android/test/TestCaseUtil.java b/test-runner/src/android/test/TestCaseUtil.java
index 3ba9711..c46d403 100644
--- a/test-runner/src/android/test/TestCaseUtil.java
+++ b/test-runner/src/android/test/TestCaseUtil.java
@@ -35,6 +35,7 @@
* @hide - This is part of a framework that is under development and should not be used for
* active development.
*/
+@Deprecated
public class TestCaseUtil {
private TestCaseUtil() {
@@ -67,7 +68,7 @@
*/
if (test instanceof TestCase &&
((TestCase)test).getName() == null) {
- workingTest = invokeSuiteMethodIfPossible(test.getClass(),
+ workingTest = invokeSuiteMethodIfPossible(test.getClass(),
seen);
}
if (workingTest == null) {
@@ -155,7 +156,7 @@
public static TestSuite createTestSuite(Class<? extends Test> testClass)
throws InstantiationException, IllegalAccessException {
- Test test = invokeSuiteMethodIfPossible(testClass,
+ Test test = invokeSuiteMethodIfPossible(testClass,
new HashSet<Class<?>>());
if (test == null) {
return new TestSuite(testClass);
diff --git a/test-runner/src/android/test/TestPrinter.java b/test-runner/src/android/test/TestPrinter.java
index 37bd721..a23f06d 100644
--- a/test-runner/src/android/test/TestPrinter.java
+++ b/test-runner/src/android/test/TestPrinter.java
@@ -30,9 +30,10 @@
* probably will not need to create or extend this class or call its methods manually.
* See the full {@link android.test} package description for information about
* getting test results.
- *
+ *
* {@hide} Not needed for 1.0 SDK.
*/
+@Deprecated
public class TestPrinter implements TestRunner.Listener, TestListener {
private String mTag;
@@ -89,7 +90,7 @@
mFailedTests.add(test.toString());
failed(test.toString(), t);
}
-
+
public void addError(Test test, Throwable t) {
failed(test, t);
}
diff --git a/test-runner/src/android/test/TestRunner.java b/test-runner/src/android/test/TestRunner.java
index 012df35..beecc6f 100644
--- a/test-runner/src/android/test/TestRunner.java
+++ b/test-runner/src/android/test/TestRunner.java
@@ -42,6 +42,7 @@
*
* {@hide} Not needed for 1.0 SDK.
*/
+@Deprecated
public class TestRunner implements PerformanceTestCase.Intermediates {
public static final int REGRESSION = 0;
public static final int PERFORMANCE = 1;
diff --git a/test-runner/src/android/test/TestSuiteProvider.java b/test-runner/src/android/test/TestSuiteProvider.java
index dc9ce6e..c74651c 100644
--- a/test-runner/src/android/test/TestSuiteProvider.java
+++ b/test-runner/src/android/test/TestSuiteProvider.java
@@ -21,6 +21,7 @@
/**
* Implementors will know how to get a test suite.
*/
+@Deprecated
public interface TestSuiteProvider {
TestSuite getTestSuite();
diff --git a/test-runner/src/android/test/TimedTest.java b/test-runner/src/android/test/TimedTest.java
index 95cc9bf..cb15ef9 100644
--- a/test-runner/src/android/test/TimedTest.java
+++ b/test-runner/src/android/test/TimedTest.java
@@ -30,6 +30,7 @@
*
* {@hide} Pending approval for public API.
*/
+@Deprecated
@Retention(RetentionPolicy.RUNTIME)
public @interface TimedTest {
boolean includeDetailedStats() default false;
diff --git a/test-runner/src/android/test/TouchUtils.java b/test-runner/src/android/test/TouchUtils.java
index 1b854b0..28dc7b2 100644
--- a/test-runner/src/android/test/TouchUtils.java
+++ b/test-runner/src/android/test/TouchUtils.java
@@ -31,9 +31,15 @@
* Reusable methods for generating touch events. These methods can be used with
* InstrumentationTestCase or ActivityInstrumentationTestCase2 to simulate user interaction with
* the application through a touch screen.
+ *
+ * @deprecated Use
+ * <a href="{@docRoot}training/testing/ui-testing/espresso-testing.html">Espresso UI testing
+ * framework</a> instead. New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public class TouchUtils {
-
+
/**
* Simulate touching in the center of the screen and dragging one quarter of the way down
* @param test The test case that is being run
@@ -46,7 +52,7 @@
public static void dragQuarterScreenDown(ActivityInstrumentationTestCase test) {
dragQuarterScreenDown(test, test.getActivity());
}
-
+
/**
* Simulate touching in the center of the screen and dragging one quarter of the way down
* @param test The test case that is being run
@@ -56,14 +62,14 @@
Display display = activity.getWindowManager().getDefaultDisplay();
final Point size = new Point();
display.getSize(size);
-
+
final float x = size.x / 2.0f;
final float fromY = size.y * 0.5f;
final float toY = size.y * 0.75f;
-
+
drag(test, x, x, fromY, toY, 4);
}
-
+
/**
* Simulate touching in the center of the screen and dragging one quarter of the way up
* @param test The test case that is being run
@@ -76,7 +82,7 @@
public static void dragQuarterScreenUp(ActivityInstrumentationTestCase test) {
dragQuarterScreenUp(test, test.getActivity());
}
-
+
/**
* Simulate touching in the center of the screen and dragging one quarter of the way up
* @param test The test case that is being run
@@ -86,18 +92,18 @@
Display display = activity.getWindowManager().getDefaultDisplay();
final Point size = new Point();
display.getSize(size);
-
+
final float x = size.x / 2.0f;
final float fromY = size.y * 0.5f;
final float toY = size.y * 0.25f;
-
+
drag(test, x, x, fromY, toY, 4);
}
-
+
/**
* Scroll a ViewGroup to the bottom by repeatedly calling
* {@link #dragQuarterScreenUp(InstrumentationTestCase, Activity)}
- *
+ *
* @param test The test case that is being run
* @param v The ViewGroup that should be dragged
*
@@ -109,11 +115,11 @@
public static void scrollToBottom(ActivityInstrumentationTestCase test, ViewGroup v) {
scrollToBottom(test, test.getActivity(), v);
}
-
+
/**
* Scroll a ViewGroup to the bottom by repeatedly calling
* {@link #dragQuarterScreenUp(InstrumentationTestCase, Activity)}
- *
+ *
* @param test The test case that is being run
* @param activity The activity that is in the foreground of the test case
* @param v The ViewGroup that should be dragged
@@ -132,7 +138,7 @@
/**
* Scroll a ViewGroup to the top by repeatedly calling
* {@link #dragQuarterScreenDown(InstrumentationTestCase, Activity)}
- *
+ *
* @param test The test case that is being run
* @param v The ViewGroup that should be dragged
*
@@ -144,11 +150,11 @@
public static void scrollToTop(ActivityInstrumentationTestCase test, ViewGroup v) {
scrollToTop(test, test.getActivity(), v);
}
-
+
/**
* Scroll a ViewGroup to the top by repeatedly calling
* {@link #dragQuarterScreenDown(InstrumentationTestCase, Activity)}
- *
+ *
* @param test The test case that is being run
* @param activity The activity that is in the foreground of the test case
* @param v The ViewGroup that should be dragged
@@ -162,10 +168,10 @@
next = new ViewStateSnapshot(v);
} while (!prev.equals(next));
}
-
+
/**
* Simulate touching the center of a view and dragging to the bottom of the screen.
- *
+ *
* @param test The test case that is being run
* @param v The view that should be dragged
*
@@ -177,10 +183,10 @@
public static void dragViewToBottom(ActivityInstrumentationTestCase test, View v) {
dragViewToBottom(test, test.getActivity(), v, 4);
}
-
+
/**
* Simulate touching the center of a view and dragging to the bottom of the screen.
- *
+ *
* @param test The test case that is being run
* @param activity The activity that is in the foreground of the test case
* @param v The view that should be dragged
@@ -188,10 +194,10 @@
public static void dragViewToBottom(InstrumentationTestCase test, Activity activity, View v) {
dragViewToBottom(test, activity, v, 4);
}
-
+
/**
* Simulate touching the center of a view and dragging to the bottom of the screen.
- *
+ *
* @param test The test case that is being run
* @param v The view that should be dragged
* @param stepCount How many move steps to include in the drag
@@ -205,10 +211,10 @@
int stepCount) {
dragViewToBottom(test, test.getActivity(), v, stepCount);
}
-
+
/**
* Simulate touching the center of a view and dragging to the bottom of the screen.
- *
+ *
* @param test The test case that is being run
* @param activity The activity that is in the foreground of the test case
* @param v The view that should be dragged
@@ -220,38 +226,38 @@
int[] xy = new int[2];
v.getLocationOnScreen(xy);
-
+
final int viewWidth = v.getWidth();
final int viewHeight = v.getHeight();
-
+
final float x = xy[0] + (viewWidth / 2.0f);
float fromY = xy[1] + (viewHeight / 2.0f);
float toY = screenHeight - 1;
-
+
drag(test, x, x, fromY, toY, stepCount);
}
/**
* Simulate touching the center of a view and releasing quickly (before the tap timeout).
- *
+ *
* @param test The test case that is being run
* @param v The view that should be clicked
*/
public static void tapView(InstrumentationTestCase test, View v) {
int[] xy = new int[2];
v.getLocationOnScreen(xy);
-
+
final int viewWidth = v.getWidth();
final int viewHeight = v.getHeight();
-
+
final float x = xy[0] + (viewWidth / 2.0f);
float y = xy[1] + (viewHeight / 2.0f);
-
+
Instrumentation inst = test.getInstrumentation();
long downTime = SystemClock.uptimeMillis();
long eventTime = SystemClock.uptimeMillis();
-
+
MotionEvent event = MotionEvent.obtain(downTime, eventTime,
MotionEvent.ACTION_DOWN, x, y, 0);
inst.sendPointerSync(event);
@@ -308,30 +314,30 @@
/**
* Simulate touching the center of a view and releasing.
- *
+ *
* @param test The test case that is being run
* @param v The view that should be clicked
*/
public static void clickView(InstrumentationTestCase test, View v) {
int[] xy = new int[2];
v.getLocationOnScreen(xy);
-
+
final int viewWidth = v.getWidth();
final int viewHeight = v.getHeight();
-
+
final float x = xy[0] + (viewWidth / 2.0f);
float y = xy[1] + (viewHeight / 2.0f);
-
+
Instrumentation inst = test.getInstrumentation();
long downTime = SystemClock.uptimeMillis();
long eventTime = SystemClock.uptimeMillis();
-
+
MotionEvent event = MotionEvent.obtain(downTime, eventTime,
MotionEvent.ACTION_DOWN, x, y, 0);
inst.sendPointerSync(event);
inst.waitForIdleSync();
-
+
eventTime = SystemClock.uptimeMillis();
final int touchSlop = ViewConfiguration.get(v.getContext()).getScaledTouchSlop();
@@ -344,7 +350,7 @@
event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP, x, y, 0);
inst.sendPointerSync(event);
inst.waitForIdleSync();
-
+
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
@@ -354,7 +360,7 @@
/**
* Simulate touching the center of a view, holding until it is a long press, and then releasing.
- *
+ *
* @param test The test case that is being run
* @param v The view that should be clicked
*
@@ -369,20 +375,20 @@
/**
* Simulate touching the center of a view, holding until it is a long press, and then releasing.
- *
+ *
* @param test The test case that is being run
* @param v The view that should be clicked
*/
public static void longClickView(InstrumentationTestCase test, View v) {
int[] xy = new int[2];
v.getLocationOnScreen(xy);
-
+
final int viewWidth = v.getWidth();
final int viewHeight = v.getHeight();
-
+
final float x = xy[0] + (viewWidth / 2.0f);
float y = xy[1] + (viewHeight / 2.0f);
-
+
Instrumentation inst = test.getInstrumentation();
long downTime = SystemClock.uptimeMillis();
@@ -399,7 +405,7 @@
x + touchSlop / 2, y + touchSlop / 2, 0);
inst.sendPointerSync(event);
inst.waitForIdleSync();
-
+
try {
Thread.sleep((long)(ViewConfiguration.getLongPressTimeout() * 1.5f));
} catch (InterruptedException e) {
@@ -414,7 +420,7 @@
/**
* Simulate touching the center of a view and dragging to the top of the screen.
- *
+ *
* @param test The test case that is being run
* @param v The view that should be dragged
*
@@ -426,10 +432,10 @@
public static void dragViewToTop(ActivityInstrumentationTestCase test, View v) {
dragViewToTop((InstrumentationTestCase) test, v, 4);
}
-
+
/**
* Simulate touching the center of a view and dragging to the top of the screen.
- *
+ *
* @param test The test case that is being run
* @param v The view that should be dragged
* @param stepCount How many move steps to include in the drag
@@ -442,20 +448,20 @@
public static void dragViewToTop(ActivityInstrumentationTestCase test, View v, int stepCount) {
dragViewToTop((InstrumentationTestCase) test, v, stepCount);
}
-
+
/**
* Simulate touching the center of a view and dragging to the top of the screen.
- *
+ *
* @param test The test case that is being run
* @param v The view that should be dragged
*/
public static void dragViewToTop(InstrumentationTestCase test, View v) {
dragViewToTop(test, v, 4);
}
-
+
/**
* Simulate touching the center of a view and dragging to the top of the screen.
- *
+ *
* @param test The test case that is being run
* @param v The view that should be dragged
* @param stepCount How many move steps to include in the drag
@@ -463,21 +469,21 @@
public static void dragViewToTop(InstrumentationTestCase test, View v, int stepCount) {
int[] xy = new int[2];
v.getLocationOnScreen(xy);
-
+
final int viewWidth = v.getWidth();
final int viewHeight = v.getHeight();
-
+
final float x = xy[0] + (viewWidth / 2.0f);
float fromY = xy[1] + (viewHeight / 2.0f);
float toY = 0;
-
+
drag(test, x, x, fromY, toY, stepCount);
}
-
+
/**
* Get the location of a view. Use the gravity param to specify which part of the view to
* return.
- *
+ *
* @param v View to find
* @param gravity A combination of (TOP, CENTER_VERTICAL, BOTTOM) and (LEFT, CENTER_HORIZONTAL,
* RIGHT)
@@ -488,7 +494,7 @@
final int viewWidth = v.getWidth();
final int viewHeight = v.getHeight();
-
+
switch (gravity & Gravity.VERTICAL_GRAVITY_MASK) {
case Gravity.TOP:
break;
@@ -501,7 +507,7 @@
default:
// Same as top -- do nothing
}
-
+
switch (gravity & Gravity.HORIZONTAL_GRAVITY_MASK) {
case Gravity.LEFT:
break;
@@ -518,14 +524,14 @@
/**
* Simulate touching a view and dragging it by the specified amount.
- *
+ *
* @param test The test case that is being run
* @param v The view that should be dragged
* @param gravity Which part of the view to use for the initial down event. A combination of
* (TOP, CENTER_VERTICAL, BOTTOM) and (LEFT, CENTER_HORIZONTAL, RIGHT)
* @param deltaX Amount to drag horizontally in pixels
* @param deltaY Amount to drag vertically in pixels
- *
+ *
* @return distance in pixels covered by the drag
*
* @deprecated {@link android.test.ActivityInstrumentationTestCase} is deprecated in favor of
@@ -537,17 +543,17 @@
int deltaX, int deltaY) {
return dragViewBy((InstrumentationTestCase) test, v, gravity, deltaX, deltaY);
}
-
+
/**
* Simulate touching a view and dragging it by the specified amount.
- *
+ *
* @param test The test case that is being run
* @param v The view that should be dragged
* @param gravity Which part of the view to use for the initial down event. A combination of
* (TOP, CENTER_VERTICAL, BOTTOM) and (LEFT, CENTER_HORIZONTAL, RIGHT)
* @param deltaX Amount to drag horizontally in pixels
* @param deltaY Amount to drag vertically in pixels
- *
+ *
* @return distance in pixels covered by the drag
*
* @deprecated {@link android.test.ActivityInstrumentationTestCase} is deprecated in favor of
@@ -558,29 +564,29 @@
public static int dragViewBy(InstrumentationTestCase test, View v, int gravity, int deltaX,
int deltaY) {
int[] xy = new int[2];
-
+
getStartLocation(v, gravity, xy);
final int fromX = xy[0];
final int fromY = xy[1];
-
+
int distance = (int) Math.hypot(deltaX, deltaY);
drag(test, fromX, fromX + deltaX, fromY, fromY + deltaY, distance);
return distance;
}
-
+
/**
* Simulate touching a view and dragging it to a specified location.
- *
+ *
* @param test The test case that is being run
* @param v The view that should be dragged
* @param gravity Which part of the view to use for the initial down event. A combination of
* (TOP, CENTER_VERTICAL, BOTTOM) and (LEFT, CENTER_HORIZONTAL, RIGHT)
* @param toX Final location of the view after dragging
* @param toY Final location of the view after dragging
- *
+ *
* @return distance in pixels covered by the drag
*
* @deprecated {@link android.test.ActivityInstrumentationTestCase} is deprecated in favor of
@@ -595,14 +601,14 @@
/**
* Simulate touching a view and dragging it to a specified location.
- *
+ *
* @param test The test case that is being run
* @param v The view that should be dragged
* @param gravity Which part of the view to use for the initial down event. A combination of
* (TOP, CENTER_VERTICAL, BOTTOM) and (LEFT, CENTER_HORIZONTAL, RIGHT)
* @param toX Final location of the view after dragging
* @param toY Final location of the view after dragging
- *
+ *
* @return distance in pixels covered by the drag
*/
public static int dragViewTo(InstrumentationTestCase test, View v, int gravity, int toX,
@@ -610,28 +616,28 @@
int[] xy = new int[2];
getStartLocation(v, gravity, xy);
-
+
final int fromX = xy[0];
final int fromY = xy[1];
-
+
int deltaX = fromX - toX;
int deltaY = fromY - toY;
-
+
int distance = (int)Math.hypot(deltaX, deltaY);
drag(test, fromX, toX, fromY, toY, distance);
-
+
return distance;
}
/**
* Simulate touching a view and dragging it to a specified location. Only moves horizontally.
- *
+ *
* @param test The test case that is being run
* @param v The view that should be dragged
* @param gravity Which part of the view to use for the initial down event. A combination of
* (TOP, CENTER_VERTICAL, BOTTOM) and (LEFT, CENTER_HORIZONTAL, RIGHT)
* @param toX Final location of the view after dragging
- *
+ *
* @return distance in pixels covered by the drag
*
* @deprecated {@link android.test.ActivityInstrumentationTestCase} is deprecated in favor of
@@ -646,39 +652,39 @@
/**
* Simulate touching a view and dragging it to a specified location. Only moves horizontally.
- *
+ *
* @param test The test case that is being run
* @param v The view that should be dragged
* @param gravity Which part of the view to use for the initial down event. A combination of
* (TOP, CENTER_VERTICAL, BOTTOM) and (LEFT, CENTER_HORIZONTAL, RIGHT)
* @param toX Final location of the view after dragging
- *
+ *
* @return distance in pixels covered by the drag
*/
public static int dragViewToX(InstrumentationTestCase test, View v, int gravity, int toX) {
int[] xy = new int[2];
getStartLocation(v, gravity, xy);
-
+
final int fromX = xy[0];
final int fromY = xy[1];
-
+
int deltaX = fromX - toX;
drag(test, fromX, toX, fromY, fromY, deltaX);
-
+
return deltaX;
}
-
+
/**
* Simulate touching a view and dragging it to a specified location. Only moves vertically.
- *
+ *
* @param test The test case that is being run
* @param v The view that should be dragged
* @param gravity Which part of the view to use for the initial down event. A combination of
* (TOP, CENTER_VERTICAL, BOTTOM) and (LEFT, CENTER_HORIZONTAL, RIGHT)
* @param toY Final location of the view after dragging
- *
+ *
* @return distance in pixels covered by the drag
*
* @deprecated {@link android.test.ActivityInstrumentationTestCase} is deprecated in favor of
@@ -690,37 +696,37 @@
int toY) {
return dragViewToY((InstrumentationTestCase) test, v, gravity, toY);
}
-
+
/**
* Simulate touching a view and dragging it to a specified location. Only moves vertically.
- *
+ *
* @param test The test case that is being run
* @param v The view that should be dragged
* @param gravity Which part of the view to use for the initial down event. A combination of
* (TOP, CENTER_VERTICAL, BOTTOM) and (LEFT, CENTER_HORIZONTAL, RIGHT)
* @param toY Final location of the view after dragging
- *
+ *
* @return distance in pixels covered by the drag
*/
public static int dragViewToY(InstrumentationTestCase test, View v, int gravity, int toY) {
int[] xy = new int[2];
getStartLocation(v, gravity, xy);
-
+
final int fromX = xy[0];
final int fromY = xy[1];
-
+
int deltaY = fromY - toY;
drag(test, fromX, fromX, fromY, toY, deltaY);
-
+
return deltaY;
}
-
+
/**
* Simulate touching a specific location and dragging to a new location.
- *
+ *
* @param test The test case that is being run
* @param fromX X coordinate of the initial touch, in screen coordinates
* @param toX Xcoordinate of the drag destination, in screen coordinates
@@ -737,10 +743,10 @@
float fromY, float toY, int stepCount) {
drag((InstrumentationTestCase) test, fromX, toX, fromY, toY, stepCount);
}
-
+
/**
* Simulate touching a specific location and dragging to a new location.
- *
+ *
* @param test The test case that is being run
* @param fromX X coordinate of the initial touch, in screen coordinates
* @param toX Xcoordinate of the drag destination, in screen coordinates
@@ -757,7 +763,7 @@
float y = fromY;
float x = fromX;
-
+
float yStep = (toY - fromY) / stepCount;
float xStep = (toX - fromX) / stepCount;
diff --git a/test-runner/src/android/test/ViewAsserts.java b/test-runner/src/android/test/ViewAsserts.java
index c575fc5..00ab443 100644
--- a/test-runner/src/android/test/ViewAsserts.java
+++ b/test-runner/src/android/test/ViewAsserts.java
@@ -23,7 +23,15 @@
/**
* Some useful assertions about views.
+ *
+ * @deprecated Use
+ * <a href="{@docRoot}reference/android/support/test/espresso/matcher/ViewMatchers.html">Espresso
+ * View Matchers</a> instead. New test should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
+ * For more information about UI testing, take the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Espresso UI testing</a> training.
*/
+@Deprecated
public class ViewAsserts {
private ViewAsserts() {}
diff --git a/test-runner/src/android/test/mock/MockApplication.java b/test-runner/src/android/test/mock/MockApplication.java
index 572dfbf..3257ecf 100644
--- a/test-runner/src/android/test/mock/MockApplication.java
+++ b/test-runner/src/android/test/mock/MockApplication.java
@@ -20,12 +20,17 @@
import android.content.res.Configuration;
/**
- * A mock {@link android.app.Application} class. All methods are non-functional and throw
- * {@link java.lang.UnsupportedOperationException}. Override it as necessary to provide the
+ * A mock {@link android.app.Application} class. All methods are non-functional and throw
+ * {@link java.lang.UnsupportedOperationException}. Override it as necessary to provide the
* operations that you need.
+ *
+ * @deprecated Use a mocking framework like <a href="https://github.com/mockito/mockito">Mockito</a>.
+ * New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public class MockApplication extends Application {
-
+
public MockApplication() {
}
@@ -38,7 +43,7 @@
public void onTerminate() {
throw new UnsupportedOperationException();
}
-
+
@Override
public void onConfigurationChanged(Configuration newConfig) {
throw new UnsupportedOperationException();
diff --git a/test-runner/src/android/test/mock/MockContentProvider.java b/test-runner/src/android/test/mock/MockContentProvider.java
index 5ef71df..3743fb0 100644
--- a/test-runner/src/android/test/mock/MockContentProvider.java
+++ b/test-runner/src/android/test/mock/MockContentProvider.java
@@ -41,7 +41,12 @@
* Mock implementation of ContentProvider. All methods are non-functional and throw
* {@link java.lang.UnsupportedOperationException}. Tests can extend this class to
* implement behavior needed for tests.
+ *
+ * @deprecated Use a mocking framework like <a href="https://github.com/mockito/mockito">Mockito</a>.
+ * New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public class MockContentProvider extends ContentProvider {
/*
* Note: if you add methods to ContentProvider, you must add similar methods to
diff --git a/test-runner/src/android/test/mock/MockContentResolver.java b/test-runner/src/android/test/mock/MockContentResolver.java
index aec6c77..75c8335 100644
--- a/test-runner/src/android/test/mock/MockContentResolver.java
+++ b/test-runner/src/android/test/mock/MockContentResolver.java
@@ -49,8 +49,12 @@
* <p>For more information about application testing, read the
* <a href="{@docRoot}guide/topics/testing/index.html">Testing</a> developer guide.</p>
* </div>
+ *
+ * @deprecated Use a mocking framework like <a href="https://github.com/mockito/mockito">Mockito</a>.
+ * New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
-
+@Deprecated
public class MockContentResolver extends ContentResolver {
Map<String, ContentProvider> mProviders;
diff --git a/test-runner/src/android/test/mock/MockContext.java b/test-runner/src/android/test/mock/MockContext.java
index 64d2978..bec1e4f 100644
--- a/test-runner/src/android/test/mock/MockContext.java
+++ b/test-runner/src/android/test/mock/MockContext.java
@@ -52,10 +52,15 @@
import java.io.InputStream;
/**
- * A mock {@link android.content.Context} class. All methods are non-functional and throw
+ * A mock {@link android.content.Context} class. All methods are non-functional and throw
* {@link java.lang.UnsupportedOperationException}. You can use this to inject other dependencies,
* mocks, or monitors into the classes you are testing.
+ *
+ * @deprecated Use a mocking framework like <a href="https://github.com/mockito/mockito">Mockito</a>.
+ * New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public class MockContext extends Context {
@Override
@@ -82,12 +87,12 @@
public Looper getMainLooper() {
throw new UnsupportedOperationException();
}
-
+
@Override
public Context getApplicationContext() {
throw new UnsupportedOperationException();
}
-
+
@Override
public void setTheme(int resid) {
throw new UnsupportedOperationException();
@@ -124,7 +129,7 @@
public ApplicationInfo getApplicationInfo() {
throw new UnsupportedOperationException();
}
-
+
@Override
public String getPackageResourcePath() {
throw new UnsupportedOperationException();
@@ -146,6 +151,16 @@
}
@Override
+ public boolean migrateSharedPreferencesFrom(Context sourceContext, String name) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean deleteSharedPreferences(String name) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
public FileInputStream openFileInput(String name) throws FileNotFoundException {
throw new UnsupportedOperationException();
}
@@ -194,7 +209,7 @@
public File getObbDir() {
throw new UnsupportedOperationException();
}
-
+
@Override
public File getCacheDir() {
throw new UnsupportedOperationException();
@@ -216,7 +231,7 @@
}
@Override
- public SQLiteDatabase openOrCreateDatabase(String file, int mode,
+ public SQLiteDatabase openOrCreateDatabase(String file, int mode,
SQLiteDatabase.CursorFactory factory) {
throw new UnsupportedOperationException();
}
@@ -238,6 +253,11 @@
}
@Override
+ public boolean migrateDatabaseFrom(Context sourceContext, String name) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
public boolean deleteDatabase(String name) {
throw new UnsupportedOperationException();
}
@@ -310,7 +330,7 @@
Bundle options) throws IntentSender.SendIntentException {
startIntentSender(intent, fillInIntent, flagsMask, flagsValues, extraFlags);
}
-
+
@Override
public void sendBroadcast(Intent intent) {
throw new UnsupportedOperationException();
diff --git a/test-runner/src/android/test/mock/MockCursor.java b/test-runner/src/android/test/mock/MockCursor.java
index 28fa0f8..576f24a 100644
--- a/test-runner/src/android/test/mock/MockCursor.java
+++ b/test-runner/src/android/test/mock/MockCursor.java
@@ -25,15 +25,18 @@
import android.os.Bundle;
/**
- * <P>
* A mock {@link android.database.Cursor} class that isolates the test code from real
* Cursor implementation.
- * </P>
- * <P>
+ *
+ * <p>
* All methods including ones related to querying the state of the cursor are
* are non-functional and throw {@link java.lang.UnsupportedOperationException}.
- * </P>
+ *
+ * @deprecated Use a mocking framework like <a href="https://github.com/mockito/mockito">Mockito</a>.
+ * New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public class MockCursor implements Cursor {
@Override
public int getColumnCount() {
diff --git a/test-runner/src/android/test/mock/MockDialogInterface.java b/test-runner/src/android/test/mock/MockDialogInterface.java
index e4dd0ba..d0a5a09 100644
--- a/test-runner/src/android/test/mock/MockDialogInterface.java
+++ b/test-runner/src/android/test/mock/MockDialogInterface.java
@@ -1,14 +1,33 @@
-// Copyright 2008 The Android Open Source Project
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package android.test.mock;
import android.content.DialogInterface;
/**
- * A mock {@link android.content.DialogInterface} class. All methods are non-functional and throw
- * {@link java.lang.UnsupportedOperationException}. Override it to provide the operations that you
+ * A mock {@link android.content.DialogInterface} class. All methods are non-functional and throw
+ * {@link java.lang.UnsupportedOperationException}. Override it to provide the operations that you
* need.
+ *
+ * @deprecated Use a mocking framework like <a href="https://github.com/mockito/mockito">Mockito</a>.
+ * New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public class MockDialogInterface implements DialogInterface {
public void cancel() {
throw new UnsupportedOperationException("not implemented yet");
diff --git a/test-runner/src/android/test/mock/MockPackageManager.java b/test-runner/src/android/test/mock/MockPackageManager.java
index 5296d4d..ffb73f6 100644
--- a/test-runner/src/android/test/mock/MockPackageManager.java
+++ b/test-runner/src/android/test/mock/MockPackageManager.java
@@ -60,7 +60,12 @@
* A mock {@link android.content.pm.PackageManager} class. All methods are non-functional and throw
* {@link java.lang.UnsupportedOperationException}. Override it to provide the operations that you
* need.
+ *
+ * @deprecated Use a mocking framework like <a href="https://github.com/mockito/mockito">Mockito</a>.
+ * New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public class MockPackageManager extends PackageManager {
@Override
diff --git a/test-runner/src/android/test/mock/MockResources.java b/test-runner/src/android/test/mock/MockResources.java
index 18752ce..880343e 100644
--- a/test-runner/src/android/test/mock/MockResources.java
+++ b/test-runner/src/android/test/mock/MockResources.java
@@ -32,10 +32,15 @@
import java.io.InputStream;
/**
- * A mock {@link android.content.res.Resources} class. All methods are non-functional and throw
- * {@link java.lang.UnsupportedOperationException}. Override it to provide the operations that you
+ * A mock {@link android.content.res.Resources} class. All methods are non-functional and throw
+ * {@link java.lang.UnsupportedOperationException}. Override it to provide the operations that you
* need.
+ *
+ * @deprecated Use a mocking framework like <a href="https://github.com/mockito/mockito">Mockito</a>.
+ * New tests should be written using the
+ * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
+@Deprecated
public class MockResources extends Resources {
public MockResources() {
diff --git a/tests/VectorDrawableTest/res/color/vector_icon_fill_state_list_simple.xml b/tests/VectorDrawableTest/res/color/vector_icon_fill_state_list_simple.xml
new file mode 100644
index 0000000..0e2467f
--- /dev/null
+++ b/tests/VectorDrawableTest/res/color/vector_icon_fill_state_list_simple.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="#f00" android:state_pressed="true" />
+ <item android:color="#00f" />
+</selector>
\ No newline at end of file
diff --git a/tests/VectorDrawableTest/res/color/vector_icon_stroke_state_list_simple.xml b/tests/VectorDrawableTest/res/color/vector_icon_stroke_state_list_simple.xml
new file mode 100644
index 0000000..7e6c8ce
--- /dev/null
+++ b/tests/VectorDrawableTest/res/color/vector_icon_stroke_state_list_simple.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="#00f" android:state_pressed="true" />
+ <item android:color="#f00" />
+</selector>
\ No newline at end of file
diff --git a/tests/VectorDrawableTest/res/drawable/vector_icon_state_list_simple.xml b/tests/VectorDrawableTest/res/drawable/vector_icon_state_list_simple.xml
new file mode 100644
index 0000000..9f08fe8
--- /dev/null
+++ b/tests/VectorDrawableTest/res/drawable/vector_icon_state_list_simple.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="64dp"
+ android:width="64dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
+
+ <path
+ android:fillColor="@color/vector_icon_fill_state_list_simple"
+ android:strokeColor="@color/vector_icon_stroke_state_list_simple"
+ android:strokeWidth="3"
+ android:pathData="M16.0,5.0c-1.955.0 -3.83,1.268 -4.5,3.0c-0.67-1.732 -2.547-3.0 -4.5-3.0C4.4570007,5.0 2.5,6.931999 2.5,9.5c0.0,3.529 3.793,6.258 9.0,11.5c5.207-5.242 9.0-7.971 9.0-11.5C20.5,6.931999 18.543,5.0 16.0,5.0z"/>
+
+</vector>
\ No newline at end of file
diff --git a/tests/VectorDrawableTest/res/drawable/vector_icon_state_list.xml b/tests/VectorDrawableTest/res/drawable/vector_icon_state_list_theme.xml
similarity index 100%
rename from tests/VectorDrawableTest/res/drawable/vector_icon_state_list.xml
rename to tests/VectorDrawableTest/res/drawable/vector_icon_state_list_theme.xml
diff --git a/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java b/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java
index a7da286..7172147 100644
--- a/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java
+++ b/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java
@@ -38,7 +38,8 @@
R.drawable.vector_icon_gradient_1,
R.drawable.vector_icon_gradient_2,
R.drawable.vector_icon_gradient_3,
- R.drawable.vector_icon_state_list,
+ R.drawable.vector_icon_state_list_simple,
+ R.drawable.vector_icon_state_list_theme,
R.drawable.vector_drawable01,
R.drawable.vector_drawable02,
R.drawable.vector_drawable03,
diff --git a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java
index b78fd49..0286506 100644
--- a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java
+++ b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java
@@ -93,7 +93,7 @@
try {
mWm.addAppToken(0, null, 0, 0, 0, false, false, 0, 0, false, false, null,
- Configuration.EMPTY, false, false);
+ Configuration.EMPTY, 0, false, false);
fail("IWindowManager.addAppToken did not throw SecurityException as"
+ " expected");
} catch (SecurityException e) {
@@ -103,7 +103,7 @@
}
try {
- mWm.setAppTask(null, 0, INVALID_STACK_ID, null, null);
+ mWm.setAppTask(null, 0, INVALID_STACK_ID, null, null, 0, false);
fail("IWindowManager.setAppGroupId did not throw SecurityException as"
+ " expected");
} catch (SecurityException e) {
diff --git a/tools/aapt/Images.cpp b/tools/aapt/Images.cpp
index 5ad3379..40466bd 100644
--- a/tools/aapt/Images.cpp
+++ b/tools/aapt/Images.cpp
@@ -873,14 +873,15 @@
static void analyze_image(const char *imageName, image_info &imageInfo, int grayscaleTolerance,
png_colorp rgbPalette, png_bytep alphaPalette,
- int *paletteEntries, bool *hasTransparency, int *colorType,
- png_bytepp outRows)
+ int *paletteEntries, int *alphaPaletteEntries, bool *hasTransparency,
+ int *colorType, png_bytepp outRows)
{
int w = imageInfo.width;
int h = imageInfo.height;
- int i, j, rr, gg, bb, aa, idx;
- uint32_t colors[256], col;
- int num_colors = 0;
+ int i, j, rr, gg, bb, aa, idx;;
+ uint32_t opaqueColors[256], alphaColors[256];
+ uint32_t col;
+ int numOpaqueColors = 0, numAlphaColors = 0;
int maxGrayDeviation = 0;
bool isOpaque = true;
@@ -891,6 +892,10 @@
// 1. Every pixel has R == G == B (grayscale)
// 2. Every pixel has A == 255 (opaque)
// 3. There are no more than 256 distinct RGBA colors
+ // We will track opaque colors separately from colors with
+ // alpha. This allows us to reencode the color table more
+ // efficiently (color tables entries without a corresponding
+ // alpha value are assumed to be opaque).
if (kIsDebug) {
printf("Initial image data:\n");
@@ -901,10 +906,34 @@
png_bytep row = imageInfo.rows[j];
png_bytep out = outRows[j];
for (i = 0; i < w; i++) {
- rr = *row++;
- gg = *row++;
- bb = *row++;
- aa = *row++;
+
+ // Make sure any zero alpha pixels are fully zeroed. On average,
+ // each of our PNG assets seem to have about four distinct pixels
+ // with zero alpha.
+ // There are several advantages to setting these to zero:
+ // (1) Images are more likely able to be encodable with a palette.
+ // (2) Image palettes will be smaller.
+ // (3) Premultiplied and unpremultiplied PNG decodes can skip
+ // writing zeros to memory, often saving significant numbers
+ // of memory pages.
+ aa = *(row + 3);
+ if (aa == 0) {
+ rr = 0;
+ gg = 0;
+ bb = 0;
+
+ // Also set red, green, and blue to zero in "row". If we later
+ // decide to encode the PNG as RGB or RGBA, we will use the
+ // values stored there.
+ *(row) = 0;
+ *(row + 1) = 0;
+ *(row + 2) = 0;
+ } else {
+ rr = *(row);
+ gg = *(row + 1);
+ bb = *(row + 2);
+ }
+ row += 4;
int odev = maxGrayDeviation;
maxGrayDeviation = MAX(ABS(rr - gg), maxGrayDeviation);
@@ -943,36 +972,68 @@
if (isPalette) {
col = (uint32_t) ((rr << 24) | (gg << 16) | (bb << 8) | aa);
bool match = false;
- for (idx = 0; idx < num_colors; idx++) {
- if (colors[idx] == col) {
- match = true;
- break;
+
+ if (aa == 0xff) {
+ for (idx = 0; idx < numOpaqueColors; idx++) {
+ if (opaqueColors[idx] == col) {
+ match = true;
+ break;
+ }
}
+
+ if (!match) {
+ if (numOpaqueColors < 256) {
+ opaqueColors[numOpaqueColors] = col;
+ }
+ numOpaqueColors++;
+ }
+
+ // Write the palette index for the pixel to outRows optimistically.
+ // We might overwrite it later if we decide to encode as gray or
+ // gray + alpha. We may also need to overwrite it when we combine
+ // into a single palette.
+ *out++ = idx;
+ } else {
+ for (idx = 0; idx < numAlphaColors; idx++) {
+ if (alphaColors[idx] == col) {
+ match = true;
+ break;
+ }
+ }
+
+ if (!match) {
+ if (numAlphaColors < 256) {
+ alphaColors[numAlphaColors] = col;
+ }
+ numAlphaColors++;
+ }
+
+ // Write the palette index for the pixel to outRows optimistically.
+ // We might overwrite it later if we decide to encode as gray or
+ // gray + alpha.
+ *out++ = idx;
}
- // Write the palette index for the pixel to outRows optimistically
- // We might overwrite it later if we decide to encode as gray or
- // gray + alpha
- *out++ = idx;
- if (!match) {
- if (num_colors == 256) {
- if (kIsDebug) {
- printf("Found 257th color at %d, %d\n", i, j);
- }
- isPalette = false;
- } else {
- colors[num_colors++] = col;
+ if (numOpaqueColors + numAlphaColors > 256) {
+ if (kIsDebug) {
+ printf("Found 257th color at %d, %d\n", i, j);
}
+ isPalette = false;
}
}
}
}
+ // If we decide to encode the image using a palette, we will reset these counts
+ // to the appropriate values later. Initializing them here avoids compiler
+ // complaints about uses of possibly uninitialized variables.
*paletteEntries = 0;
- *hasTransparency = !isOpaque;
- int bpp = isOpaque ? 3 : 4;
- int paletteSize = w * h + bpp * num_colors;
+ *alphaPaletteEntries = 0;
+ *hasTransparency = !isOpaque;
+ int paletteSize = w * h + 3 * numOpaqueColors + 4 * numAlphaColors;
+
+ int bpp = isOpaque ? 3 : 4;
if (kIsDebug) {
printf("isGrayscale = %s\n", isGrayscale ? "true" : "false");
printf("isOpaque = %s\n", isOpaque ? "true" : "false");
@@ -1017,16 +1078,37 @@
// color type chosen
if (*colorType == PNG_COLOR_TYPE_PALETTE) {
+ // Combine the alphaColors and the opaqueColors into a single palette.
+ // The alphaColors must be at the start of the palette.
+ uint32_t* colors = alphaColors;
+ memcpy(colors + numAlphaColors, opaqueColors, 4 * numOpaqueColors);
+
+ // Fix the indices of the opaque colors in the image.
+ for (j = 0; j < h; j++) {
+ png_bytep row = imageInfo.rows[j];
+ png_bytep out = outRows[j];
+ for (i = 0; i < w; i++) {
+ uint32_t pixel = ((uint32_t*) row)[i];
+ if (pixel >> 24 == 0xFF) {
+ out[i] += numAlphaColors;
+ }
+ }
+ }
+
// Create separate RGB and Alpha palettes and set the number of colors
- *paletteEntries = num_colors;
+ int numColors = numOpaqueColors + numAlphaColors;
+ *paletteEntries = numColors;
+ *alphaPaletteEntries = numAlphaColors;
// Create the RGB and alpha palettes
- for (int idx = 0; idx < num_colors; idx++) {
+ for (int idx = 0; idx < numColors; idx++) {
col = colors[idx];
rgbPalette[idx].red = (png_byte) ((col >> 24) & 0xff);
rgbPalette[idx].green = (png_byte) ((col >> 16) & 0xff);
rgbPalette[idx].blue = (png_byte) ((col >> 8) & 0xff);
- alphaPalette[idx] = (png_byte) (col & 0xff);
+ if (idx < numAlphaColors) {
+ alphaPalette[idx] = (png_byte) (col & 0xff);
+ }
}
} else if (*colorType == PNG_COLOR_TYPE_GRAY || *colorType == PNG_COLOR_TYPE_GRAY_ALPHA) {
// If the image is gray or gray + alpha, compact the pixels into outRows
@@ -1090,10 +1172,10 @@
png_color rgbPalette[256];
png_byte alphaPalette[256];
bool hasTransparency;
- int paletteEntries;
+ int paletteEntries, alphaPaletteEntries;
analyze_image(imageName, imageInfo, grayscaleTolerance, rgbPalette, alphaPalette,
- &paletteEntries, &hasTransparency, &color_type, outRows);
+ &paletteEntries, &alphaPaletteEntries, &hasTransparency, &color_type, outRows);
if (kIsDebug) {
switch (color_type) {
@@ -1124,7 +1206,8 @@
if (color_type == PNG_COLOR_TYPE_PALETTE) {
png_set_PLTE(write_ptr, write_info, rgbPalette, paletteEntries);
if (hasTransparency) {
- png_set_tRNS(write_ptr, write_info, alphaPalette, paletteEntries, (png_color_16p) 0);
+ png_set_tRNS(write_ptr, write_info, alphaPalette, alphaPaletteEntries,
+ (png_color_16p) 0);
}
png_set_filter(write_ptr, 0, PNG_NO_FILTERS);
} else {
diff --git a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
index 9f0153a..38eb5ee 100644
--- a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
+++ b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
@@ -77,7 +77,8 @@
@Override
public void addAppToken(int arg0, IApplicationToken arg1, int arg2, int arg3, int arg4,
boolean arg5, boolean arg6, int arg7, int arg8, boolean arg9, boolean arg10,
- Rect arg11, Configuration arg12, boolean arg13, boolean arg14) throws RemoteException {
+ Rect arg11, Configuration arg12, int arg13, boolean arg14, boolean arg15)
+ throws RemoteException {
// TODO Auto-generated method stub
}
@@ -322,7 +323,8 @@
}
@Override
- public void setAppTask(IBinder arg0, int arg1, int arg2, Rect arg3, Configuration arg4)
+ public void setAppTask(IBinder arg0, int arg1, int arg2, Rect arg3, Configuration arg4,
+ int arg5, boolean arg6)
throws RemoteException {
// TODO Auto-generated method stub
}
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
index e6fb620..4b89217 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
@@ -1258,6 +1258,12 @@
}
@Override
+ public boolean migrateDatabaseFrom(Context sourceContext, String name) {
+ // pass
+ return false;
+ }
+
+ @Override
public boolean deleteDatabase(String arg0) {
// pass
return false;
@@ -1439,6 +1445,18 @@
}
@Override
+ public boolean migrateSharedPreferencesFrom(Context sourceContext, String name) {
+ // pass
+ return false;
+ }
+
+ @Override
+ public boolean deleteSharedPreferences(String name) {
+ // pass
+ return false;
+ }
+
+ @Override
public Drawable getWallpaper() {
// pass
return null;
diff --git a/wifi/java/android/net/wifi/ScanResult.java b/wifi/java/android/net/wifi/ScanResult.java
index dc06789..1f05339 100644
--- a/wifi/java/android/net/wifi/ScanResult.java
+++ b/wifi/java/android/net/wifi/ScanResult.java
@@ -18,7 +18,9 @@
import android.os.Parcel;
import android.os.Parcelable;
-import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* Describes information about a detected access point. In addition
@@ -301,6 +303,12 @@
/**
* @hide
+ * anqp lines from supplicant BSS response
+ */
+ public List<String> anqpLines;
+
+ /**
+ * @hide
* storing the raw bytes of full result IEs
**/
public byte[] bytes;
@@ -518,6 +526,15 @@
} else {
dest.writeInt(0);
}
+
+ if (anqpLines != null) {
+ dest.writeInt(anqpLines.size());
+ for (int i = 0; i < anqpLines.size(); i++) {
+ dest.writeString(anqpLines.get(i));
+ }
+ } else {
+ dest.writeInt(0);
+ }
}
/** Implement the Parcelable interface {@hide} */
@@ -565,6 +582,14 @@
in.readByteArray(sr.informationElements[i].bytes);
}
}
+
+ n = in.readInt();
+ if (n != 0) {
+ sr.anqpLines = new ArrayList<String>();
+ for (int i = 0; i < n; i++) {
+ sr.anqpLines.add(in.readString());
+ }
+ }
return sr;
}
diff --git a/wifi/java/android/net/wifi/nan/IWifiNanManager.aidl b/wifi/java/android/net/wifi/nan/IWifiNanManager.aidl
index ff3d29f..ec9e462 100644
--- a/wifi/java/android/net/wifi/nan/IWifiNanManager.aidl
+++ b/wifi/java/android/net/wifi/nan/IWifiNanManager.aidl
@@ -43,7 +43,8 @@
void publish(int sessionId, in PublishData publishData, in PublishSettings publishSettings);
void subscribe(int sessionId, in SubscribeData subscribeData,
in SubscribeSettings subscribeSettings);
- void sendMessage(int sessionId, int peerId, in byte[] message, int messageLength);
+ void sendMessage(int sessionId, int peerId, in byte[] message, int messageLength,
+ int messageId);
void stopSession(int sessionId);
void destroySession(int sessionId);
}
diff --git a/wifi/java/android/net/wifi/nan/IWifiNanSessionListener.aidl b/wifi/java/android/net/wifi/nan/IWifiNanSessionListener.aidl
index 773f83b..50c34d9 100644
--- a/wifi/java/android/net/wifi/nan/IWifiNanSessionListener.aidl
+++ b/wifi/java/android/net/wifi/nan/IWifiNanSessionListener.aidl
@@ -32,7 +32,7 @@
void onMatch(int peerId, in byte[] serviceSpecificInfo,
int serviceSpecificInfoLength, in byte[] matchFilter, int matchFilterLength);
- void onMessageSendSuccess();
- void onMessageSendFail(int reason);
+ void onMessageSendSuccess(int messageId);
+ void onMessageSendFail(int messageId, int reason);
void onMessageReceived(int peerId, in byte[] message, int messageLength);
}
diff --git a/wifi/java/android/net/wifi/nan/WifiNanManager.java b/wifi/java/android/net/wifi/nan/WifiNanManager.java
index 877f993..cb82268 100644
--- a/wifi/java/android/net/wifi/nan/WifiNanManager.java
+++ b/wifi/java/android/net/wifi/nan/WifiNanManager.java
@@ -319,13 +319,14 @@
/**
* {@hide}
*/
- public void sendMessage(int sessionId, int peerId, byte[] message, int messageLength) {
+ public void sendMessage(int sessionId, int peerId, byte[] message, int messageLength,
+ int messageId) {
try {
if (VDBG) {
Log.v(TAG, "sendMessage(): sessionId=" + sessionId + ", peerId=" + peerId
- + ", messageLength=" + messageLength);
+ + ", messageLength=" + messageLength + ", messageId=" + messageId);
}
- mService.sendMessage(sessionId, peerId, message, messageLength);
+ mService.sendMessage(sessionId, peerId, message, messageLength, messageId);
} catch (RemoteException e) {
Log.w(TAG, "subscribe RemoteException (FYI - ignoring): " + e);
}
diff --git a/wifi/java/android/net/wifi/nan/WifiNanSession.java b/wifi/java/android/net/wifi/nan/WifiNanSession.java
index c6b384e..d0a9410 100644
--- a/wifi/java/android/net/wifi/nan/WifiNanSession.java
+++ b/wifi/java/android/net/wifi/nan/WifiNanSession.java
@@ -103,8 +103,11 @@
* @param message The message to be transmitted.
* @param messageLength The number of bytes from the {@code message} to be
* transmitted.
+ * @param messageId An arbitrary integer used by the caller to identify the
+ * message. The same integer ID will be returned in the callbacks
+ * indicated message send success or failure.
*/
- public void sendMessage(int peerId, byte[] message, int messageLength) {
- mManager.sendMessage(mSessionId, peerId, message, messageLength);
+ public void sendMessage(int peerId, byte[] message, int messageLength, int messageId) {
+ mManager.sendMessage(mSessionId, peerId, message, messageLength, messageId);
}
}
diff --git a/wifi/java/android/net/wifi/nan/WifiNanSessionListener.java b/wifi/java/android/net/wifi/nan/WifiNanSessionListener.java
index c9d08c7..d5e59f0 100644
--- a/wifi/java/android/net/wifi/nan/WifiNanSessionListener.java
+++ b/wifi/java/android/net/wifi/nan/WifiNanSessionListener.java
@@ -210,10 +210,10 @@
msg.getData().getByteArray(MESSAGE_BUNDLE_KEY_MESSAGE2), msg.arg2);
break;
case LISTEN_MESSAGE_SEND_SUCCESS:
- WifiNanSessionListener.this.onMessageSendSuccess();
+ WifiNanSessionListener.this.onMessageSendSuccess(msg.arg1);
break;
case LISTEN_MESSAGE_SEND_FAIL:
- WifiNanSessionListener.this.onMessageSendFail(msg.arg1);
+ WifiNanSessionListener.this.onMessageSendFail(msg.arg1, msg.arg2);
break;
case LISTEN_MESSAGE_RECEIVED:
WifiNanSessionListener.this.onMessageReceived(msg.arg2,
@@ -306,7 +306,7 @@
* {@link WifiNanSessionListener#onMessageSendFail(int)} will be received -
* never both.
*/
- public void onMessageSendSuccess() {
+ public void onMessageSendSuccess(int messageId) {
if (VDBG) Log.v(TAG, "onMessageSendSuccess: called in stub - override if interested");
}
@@ -325,7 +325,7 @@
* @param reason The failure reason using {@code NanSessionListener.FAIL_*}
* codes.
*/
- public void onMessageSendFail(int reason) {
+ public void onMessageSendFail(int messageId, int reason) {
if (VDBG) Log.v(TAG, "onMessageSendFail: called in stub - override if interested");
}
@@ -401,19 +401,21 @@
}
@Override
- public void onMessageSendSuccess() {
+ public void onMessageSendSuccess(int messageId) {
if (VDBG) Log.v(TAG, "onMessageSendSuccess");
Message msg = mHandler.obtainMessage(LISTEN_MESSAGE_SEND_SUCCESS);
+ msg.arg1 = messageId;
mHandler.sendMessage(msg);
}
@Override
- public void onMessageSendFail(int reason) {
+ public void onMessageSendFail(int messageId, int reason) {
if (VDBG) Log.v(TAG, "onMessageSendFail: reason=" + reason);
Message msg = mHandler.obtainMessage(LISTEN_MESSAGE_SEND_FAIL);
- msg.arg1 = reason;
+ msg.arg1 = messageId;
+ msg.arg2 = reason;
mHandler.sendMessage(msg);
}